Weed out a few leftover server instances from before modules had ServerInstance....

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index aee478e2e334fa1604309765127c64c86f6a9921..a1211886176e05c90fdefa4140346ea498763b01 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.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.
@@ -35,13 +35,13 @@ bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string>
 {
        if (params.size() < 5)
        {
-               SendError("Protocol error - Missing SID");
+               SendError("Protocol error - Not enough parameters for SERVER command");
                return false;
        }
 
        std::string servername = params[0];
-       std::string password = params[1];
-       // hopcount is not used for a remote server, we calculate this ourselves
+       // password is not used for a remote server
+       // hopcount is not used (ever)
        std::string sid = params[3];
        std::string description = params[4];
        TreeServer* ParentOfThis = Utils->FindServer(prefix);
@@ -59,26 +59,28 @@ bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string>
        TreeServer* CheckDupe = Utils->FindServer(servername);
        if (CheckDupe)
        {
-               this->SendError("Server "+CheckDupe->GetName()+" already exists!");
+               this->SendError("Server "+servername+" already exists!");
                this->ServerInstance->SNO->WriteToSnoMask('L', "Server \2"+CheckDupe->GetName()+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, already exists. Closing link with " + ParentOfThis->GetName());
                return false;
        }
-
-       Link* lnk = Utils->FindLink(servername);
-
-       TreeServer *Node = new TreeServer(this->Utils, this->ServerInstance, servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false);
-
-       if (Node->DuplicateID())
+       CheckDupe = Utils->FindServer(sid);
+       if (CheckDupe)
        {
-               this->SendError("Server ID "+servername+" already exists on the network! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
+               this->SendError("Server ID "+sid+" already exists! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
                this->ServerInstance->SNO->WriteToSnoMask('L', "Server \2"+servername+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName());
                return false;
        }
 
+
+       Link* lnk = Utils->FindLink(servername);
+
+       TreeServer *Node = new TreeServer(this->Utils, this->ServerInstance, servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false);
+
        ParentOfThis->AddChild(Node);
        params[4] = ":" + params[4];
        Utils->DoOneToAllButSender(prefix,"SERVER",params,prefix);
        this->ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+ParentOfThis->GetName()+"\002 introduced server \002"+servername+"\002 ("+description+")");
+       Node->bursting = true;
        return true;
 }
 
@@ -91,7 +93,7 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
 {
        if (params.size() < 5)
        {
-               SendError("Protocol error - Missing SID");
+               SendError("Protocol error - Not enough parameters for SERVER command");
                return false;
        }
 
@@ -127,8 +129,7 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;
 
-               if (!ComparePass(this->MakePass(x->RecvPass, this->GetOurChallenge()), password) &&
-                       (x->RecvPass != password && this->GetTheirChallenge().empty()))
+               if (!ComparePass(x->RecvPass, password))
                {
                        this->ServerInstance->SNO->WriteToSnoMask('l',"Invalid password on link: %s", x->Name.c_str());
                        continue;
@@ -141,6 +142,13 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
                        this->ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
                        return false;
                }
+               CheckDupe = Utils->FindServer(sid);
+               if (CheckDupe)
+               {
+                       this->SendError("Server ID "+sid+" already exists on the network! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
+                       this->ServerInstance->SNO->WriteToSnoMask('l',"Server \2"+assign(servername)+"\2 being introduced denied, server ID already exists on the network. Closing link.");
+                       return false;
+               }
 
                /*
                 * They're in WAIT_AUTH_2 (having accepted our credentials).
@@ -156,13 +164,6 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
 
                TreeServer *Node = new TreeServer(this->Utils, this->ServerInstance, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
 
-               if (Node->DuplicateID())
-               {
-                       this->SendError("Server ID "+sid+" already exists on the network! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
-                       this->ServerInstance->SNO->WriteToSnoMask('l',"Server \2"+assign(servername)+"\2 being introduced denied, server ID already exists on the network. Closing link.");
-                       return false;
-               }
-
                Utils->TreeRoot->AddChild(Node);
                params[4] = ":" + params[4];
 
@@ -225,25 +226,12 @@ bool TreeSocket::Inbound_Server(std::deque<std::string> &params)
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;
 
-               if (!ComparePass(this->MakePass(x->RecvPass, this->GetOurChallenge()), password) &&
-                       (x->RecvPass != password && this->GetTheirChallenge().empty()))
+               if (!ComparePass(x->RecvPass, password))
                {
                        this->ServerInstance->SNO->WriteToSnoMask('l',"Invalid password on link: %s", x->Name.c_str());
                        continue;
                }
 
-               /* Check for fully initialized instances of the server by id */
-               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Looking for dupe SID %s", sid.c_str());
-               TreeServer* CheckDupeSID = Utils->FindServerID(sid);
-
-               if (CheckDupeSID)
-               {
-                       this->SendError("Server ID "+CheckDupeSID->GetID()+" already exists on server "+CheckDupeSID->GetName()+"! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
-                       this->ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupeSID->GetID()+
-                                       "' already exists on server "+CheckDupeSID->GetName());
-                       return false;
-               }
-
                /* Now check for fully initialized ServerInstances of the server by name */
                TreeServer* CheckDupe = Utils->FindServer(sname);
                if (CheckDupe)
@@ -253,6 +241,19 @@ bool TreeSocket::Inbound_Server(std::deque<std::string> &params)
                        return false;
                }
 
+               /* Check for fully initialized instances of the server by id */
+               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Looking for dupe SID %s", sid.c_str());
+               CheckDupe = Utils->FindServerID(sid);
+
+               if (CheckDupe)
+               {
+                       this->SendError("Server ID "+CheckDupe->GetID()+" already exists on server "+CheckDupe->GetName()+"! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
+                       this->ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupe->GetID()+
+                                       "' already exists on server "+CheckDupe->GetName());
+                       return false;
+               }
+
+
                this->ServerInstance->SNO->WriteToSnoMask('l',"Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")");
                if (this->Hook)
                {