Fix excessive snomask sending on fitler add/removal

[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 0aaabfd81a0077a5c98f722fde0f12baae31268a..72fd66f95d8d03e268083945490a877ee366eb58 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -31,10 +31,8 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
         */
        if (params.size() < 10)
        {
-               if (!params.empty())
-                       this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+
-                                       ConvToStr(params.size())+" of 10 or more parameters?)");
-               return true;
+               this->SendError("Invalid client introduction (wanted 10 or more parameters, got " + (params.empty() ? "0" : ConvToStr(params.size())) + "!)");
+               return false;
        }
 
        time_t age_t = ConvToInt(params[1]);
@@ -45,15 +43,24 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
 
        if (!remoteserver)
        {
-               this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Unknown server "+source+")");
-               return true;
+               this->SendError("Invalid client introduction (Unknown server "+source+")");
+               return false;
        }
-
        /* Check parameters for validity before introducing the client, discovered by dmb */
-       if (!age_t)
+       else if (!age_t)
        {
-               this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Invalid TS?)");
-               return true;
+               this->SendError("Invalid client introduction (Invalid TS?)");
+               return false;
+       }
+       else if (!signon)
+       {
+               this->SendError("Invalid client introduction (Invalid signon?)");
+               return false;
+       }
+       else if (params[8][0] != '+')
+       {
+               this->SendError("Invalid client introduction (Malformed MODE sequence?)");
+               return false;
        }
 
        /* check for collision */
@@ -64,10 +71,10 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
                /*
                 * Nick collision.
                 */
-               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", params[2].c_str());
                int collide = this->DoCollision(iter->second, age_t, params[5], params[8], params[0]);
+               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
-               if (collide == 2)
+               if (collide != 1)
                {
                        /* remote client changed, make sure we change their nick for the hash too */
                        params[2] = params[0];
@@ -84,7 +91,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        }
        catch (...)
        {
-               SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
+               this->SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
                return false;
        }
        (*(this->ServerInstance->Users->clientlist))[params[2]] = _new;
@@ -130,10 +137,8 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
                                        mh->OnModeChange(_new, _new, NULL, params[paramptr++], true);
                                else
                                {
-                                       this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Broken UID command, expected a parameter for user mode '"+(*v)+"' but there aren't enough parameters in the command!");
-                                       this->ServerInstance->Users->clientlist->erase(params[0]);
-                                       delete _new;
-                                       return true;
+                                       this->SendError(std::string("Broken UID command, expected a parameter for user mode '")+(*v)+"' but there aren't enough parameters in the command!");
+                                       return false;
                                }
                        }
                        else
@@ -143,15 +148,11 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
                }
                else
                {
-                       this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Warning: Broken UID command, unknown user mode '"+(*v)+"' in the mode string!");
-                       this->ServerInstance->Users->clientlist->erase(params[0]);
-                       delete _new;
-                       return true;
+                       this->SendError(std::string("Warning: Broken UID command, unknown user mode '")+(*v)+"' in the mode string! (mismatched module?)");
+                       return false;
                }
        }
 
-       //_new->ProcessNoticeMasks(params[7].c_str());
-
        /* now we've done with modes processing, put the + back for remote servers */
        if (params[8][0] != '+')
                params[8] = "+" + params[8];