Fix module unmapping with culled Module objects

[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 697dbe6893c3ed7ed06a2cb3a13c8f0737aa8d3c..4e3b07eea02d64132ff2051b7e8c0553d6f90ab3 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,16 @@
 
 #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"
 
 /* $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, const std::string &up)
+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)
@@ -40,13 +39,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        std::string empty;
 
        TreeServer* remoteserver = Utils->FindServer(source);
-       TreeServer* uplink = Utils->FindServer(up);
 
-       if (!uplink)
-       {
-               this->SendError("Invalid client introduction (Can't determine name of uplink!)");
-               return false;
-       }
        if (!remoteserver)
        {
                this->SendError("Invalid client introduction (Unknown server "+source+")");
@@ -70,9 +63,9 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        }
 
        /* check for collision */
-       user_hash::iterator iter = this->ServerInstance->Users->clientlist->find(params[2]);
+       user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
 
-       if (iter != this->ServerInstance->Users->clientlist->end())
+       if (iter != ServerInstance->Users->clientlist->end())
        {
                /*
                 * Nick collision.
@@ -93,19 +86,19 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
        User* _new = NULL;
        try
        {
-               _new = new User(this->ServerInstance, params[0]);
+               _new = new User(params[0]);
        }
        catch (...)
        {
                this->SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
                return false;
        }
-       (*(this->ServerInstance->Users->clientlist))[params[2]] = _new;
+       (*(ServerInstance->Users->clientlist))[params[2]] = _new;
        _new->SetFd(FD_MAGIC_NUMBER);
        _new->nick.assign(params[2], 0, MAXBUF);
        _new->host.assign(params[3], 0, 64);
        _new->dhost.assign(params[4], 0, 64);
-       _new->server = this->ServerInstance->FindServerNamePtr(remoteserver->GetName().c_str());
+       _new->server = remoteserver->GetName();
        _new->ident.assign(params[5], 0, MAXBUF);
        _new->fullname.assign(params[params.size() - 1], 0, MAXBUF);
        _new->registered = REG_ALL;
@@ -163,28 +156,23 @@ 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;
 
-       if ((this->Utils->quiet_bursts && (remoteserver->bursting || uplink->bursting)) || this->ServerInstance->SilentULine(_new->server))
+       if ((this->Utils->quiet_bursts && remoteserver->bursting) || ServerInstance->SilentULine(_new->server))
                dosend = false;
 
        if (dosend)
-               this->ServerInstance->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());
+               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());
 
        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));
+       FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
 
        return true;
 }