Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

[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 2ebceb3cf97b5e3887b434a2f540579b52235841..14c4e2bb59077c4037d637360b73d0c1b7ef248b 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -33,18 +33,19 @@
 bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &params)
 {
        /** Do we have enough parameters:
-        * UID uuid age nick host dhost ident +modestr ip.string :gecos
+        *      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)
+       if (params.size() < 10)
        {
                if (!params.empty())
                        this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+
-                                       ConvToStr(params.size())+" of 10 parameters?)");
+                                       ConvToStr(params.size())+" of 10 or more parameters?)");
                return true;
        }
 
        time_t age_t = ConvToInt(params[1]);
-       time_t signon = ConvToInt(params[8]);
+       time_t signon = ConvToInt(params[7]);
        std::string empty;
 
        TreeServer* remoteserver = Utils->FindServer(source);
@@ -71,7 +72,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
                 * Nick collision.
                 */
                Instance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", params[2].c_str());
-               int collide = this->DoCollision(iter->second, age_t, params[5], params[7], params[0]);
+               int collide = this->DoCollision(iter->second, age_t, params[5], params[8], params[0]);
 
                if (collide == 2)
                {
@@ -100,38 +101,55 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        _new->dhost.assign(params[4], 0, 64);
        _new->server = this->Instance->FindServerNamePtr(remoteserver->GetName().c_str());
        _new->ident.assign(params[5], 0, MAXBUF);
-       _new->fullname.assign(params[9], 0, MAXBUF);
+       _new->fullname.assign(params[params.size() - 1], 0, MAXBUF);
        _new->registered = REG_ALL;
        _new->signon = signon;
        _new->age = age_t;
 
        /* we need to remove the + from the modestring, so we can do our stuff */
-       std::string::size_type pos_after_plus = params[6].find_first_not_of('+');
+       std::string::size_type pos_after_plus = params[8].find_first_not_of('+');
        if (pos_after_plus != std::string::npos)
-       params[6] = params[6].substr(pos_after_plus);
+       params[8] = params[8].substr(pos_after_plus);
 
-       for (std::string::iterator v = params[6].begin(); v != params[6].end(); v++)
+       unsigned int paramptr = 9;
+       for (std::string::iterator v = params[8].begin(); v != params[8].end(); v++)
        {
+               if (*v == '+')
+                       continue;
+
                /* For each mode thats set, increase counter */
                ModeHandler* mh = Instance->Modes->FindMode(*v, MODETYPE_USER);
 
                if (mh)
                {
-                       mh->OnModeChange(_new, _new, NULL, empty, true);
+                       if (mh->GetNumParams(true))
+                       {
+                               if (paramptr < params.size() - 1)
+                                       mh->OnModeChange(_new, _new, NULL, params[paramptr++], true);
+                               else
+                                       Instance->Logs->Log("m_spanningtree", DEBUG, "Warning: Broken UID command, expected a parameter for user mode '%c' but there aren't enough parameters in the command!", *v);
+                       }
+                       else
+                               mh->OnModeChange(_new, _new, NULL, empty, true);
                        _new->SetMode(*v, true);
                        mh->ChangeCount(1);
                }
+               else
+                       Instance->Logs->Log("m_spanningtree", DEBUG, "Warning: Broken UID command, unknown user mode '%c' in the mode string!", *v);
        }
 
+       //_new->ProcessNoticeMasks(params[7].c_str());
+
        /* now we've done with modes processing, put the + back for remote servers */
-       params[6] = "+" + params[6];
+       if (params[8][0] != '+')
+               params[8] = "+" + params[8];
 
 #ifdef SUPPORT_IP6LINKS
-       if (params[7].find_first_of(":") != std::string::npos)
-               _new->SetSockAddr(AF_INET6, params[7].c_str(), 0);
+       if (params[6].find_first_of(":") != std::string::npos)
+               _new->SetSockAddr(AF_INET6, params[6].c_str(), 0);
        else
 #endif
-               _new->SetSockAddr(AF_INET, params[7].c_str(), 0);
+               _new->SetSockAddr(AF_INET, params[6].c_str(), 0);
 
        Instance->Users->AddGlobalClone(_new);
 
@@ -143,7 +161,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        if (dosend)
                this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server, _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
 
-       params[9] = ":" + params[9];
+       params[params.size() - 1] = ":" + params[params.size() - 1];
        Utils->DoOneToAllButSender(source, "UID", params, source);
 
        Instance->PI->Introduce(_new);