Add LOG_ prefix to the log level enum values.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / uid.cpp

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 67a21a4844a1bd1f7b729851f6d9d07a8d85b1b3..d6bded5e5957a3e8a3c2c145ed0183a04a96e1ef 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -35,9 +35,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
         *      0    1    2    3    4    5        6        7     8        9       (n-1)
         * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
         */
-       if (params.size() < 10)
-               return CMD_INVALID;
-
        time_t age_t = ConvToInt(params[1]);
        time_t signon = ConvToInt(params[7]);
        std::string empty;
@@ -67,8 +64,8 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                /*
                 * Nick collision.
                 */
-               int collide = sock->DoCollision(iter->second, age_t, params[5], modestr, params[0]);
-               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
+               int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
+               ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
                if (collide != 1)
                {
@@ -91,7 +88,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        }
        catch (...)
        {
-               ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
+               ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
                return CMD_INVALID;
        }
        (*(ServerInstance->Users->clientlist))[params[2]] = _new;
@@ -154,7 +151,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                dosend = false;
 
        if (dosend)
-               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server.c_str(), _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
+               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str());
 
        FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
 
@@ -163,8 +160,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
 CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
 {
-       if (params.size() < 1)
-               return CMD_INVALID;
        if (IS_SERVER(src))
                return CMD_FAILURE;
        src->ChangeDisplayedHost(params[0].c_str());
@@ -173,8 +168,6 @@ CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
 
 CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
 {
-       if (params.size() < 1)
-               return CMD_INVALID;
        if (IS_SERVER(src))
                return CMD_FAILURE;
        src->ChangeIdent(params[0].c_str());
@@ -183,8 +176,6 @@ CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
 
 CmdResult CommandFName::Handle(const parameterlist &params, User* src)
 {
-       if (params.size() < 1)
-               return CMD_INVALID;
        if (IS_SERVER(src))
                return CMD_FAILURE;
        src->ChangeName(params[0].c_str());