modulemanger: check dependencies correctly

[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 80aa494823296acf3027ff0298259a9d902db4f6..b7c13b5f85403208343c9f3ae71082192b7e38d0 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,17 +13,17 @@
 
 #include "inspircd.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h m_spanningtree/handshaketimer.h */
 
-bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &params)
+bool TreeSocket::ParseUID(const std::string &source, parameterlist &params)
 {
        /** Do we have enough parameters:
         *      0    1    2    3    4    5        6        7     8        9       (n-1)
@@ -62,11 +62,6 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
                this->SendError("Invalid client introduction (Malformed MODE sequence?)");
                return false;
        }
-       else if (!ServerInstance->IsNick(parameters[0].c_str(), ServerInstance->Config->Limits.NickMax))
-       {
-               this->SendError("Invalid client introduction (Nickname was not valid according to me)");
-               return false;
-       }
 
        /* check for collision */
        user_hash::iterator iter = this->ServerInstance->Users->clientlist->find(params[2]);
@@ -76,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];
@@ -162,14 +157,10 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        if (params[8][0] != '+')
                params[8] = "+" + params[8];
 
-#ifdef SUPPORT_IP6LINKS
-       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[6].c_str(), 0);
+       _new->SetClientIP(params[6].c_str());
 
        ServerInstance->Users->AddGlobalClone(_new);
+       remoteserver->SetUserCount(1); // increment by 1
 
        bool dosend = true;
 
@@ -182,7 +173,6 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        params[params.size() - 1] = ":" + params[params.size() - 1];
        Utils->DoOneToAllButSender(source, "UID", params, source);
 
-       ServerInstance->PI->Introduce(_new);
        FOREACH_MOD_I(ServerInstance,I_OnPostConnect,OnPostConnect(_new));
 
        return true;