Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 64c32e8fbb3b2aa8cdbc17ab72f8ddf02a44f627..d3033799e1a21d8d91990b51377bcf32cbd64871 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -137,8 +137,9 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
                TreeServer* CheckDupe = Utils->FindServer(sname);
                if (CheckDupe)
                {
-                       this->SendError("Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
-                       ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+                       std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>";
+                       SendError("Server "+sname+" already exists on server "+pname+"!");
+                       ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname);
                        return false;
                }
                CheckDupe = Utils->FindServer(sid);
@@ -175,11 +176,38 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
                return true;
        }
 
-       this->SendError("Invalid credentials (check the other server's linking snomask for more information)");
+       this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. umode +s +Ll)");
        ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
        return false;
 }
 
+bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid)
+{
+       /* Check for fully initialized instances of the server by name */
+       TreeServer* CheckDupe = Utils->FindServer(sname);
+       if (CheckDupe)
+       {
+               std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>";
+               SendError("Server "+sname+" already exists on server "+pname+"!");
+               ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname);
+               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.");
+               ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupe->GetID()+
+                               "' already exists on server "+CheckDupe->GetName());
+               return false;
+       }
+
+       return true;
+}
+
 /*
  * Someone else is attempting to connect to us if this is called. Validate their credentials etc.
  *             -- w
@@ -226,44 +254,29 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
                        continue;
                }
 
-               /* Now check for fully initialized ServerInstances of the server by name */
-               TreeServer* CheckDupe = Utils->FindServer(sname);
-               if (CheckDupe)
-               {
-                       std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>";
-                       SendError("Server "+sname+" already exists on server "+pname+"!");
-                       ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname);
+               if (!CheckDuplicate(sname, sid))
                        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);
+               ServerInstance->SNO->WriteToSnoMask('l',"Verified incoming server connection " + linkID + " ("+description+")");
 
-               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.");
-                       ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupe->GetID()+
-                                       "' already exists on server "+CheckDupe->GetName());
-                       return false;
-               }
+               this->SendCapabilities(2);
 
-               ServerInstance->SNO->WriteToSnoMask('l',"Verified incoming server connection " + linkID + " ("+description+")");
-               linkID = sname;
+               // Save these for later, so when they accept our credentials (indicated by BURST) we remember them
+               this->capab->hidden = x->Hidden;
+               this->capab->sid = sid;
+               this->capab->description = description;
+               this->capab->name = sname;
 
-               // this is good. Send our details: Our server name and description and hopcount of 0,
+               // Send our details: Our server name and description and hopcount of 0,
                // along with the sendpass from this block.
-               this->SendCapabilities(2);
-               this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(x->SendPass, this->GetTheirChallenge())+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
-               // move to the next state, we are now waiting for THEM.
-               MyRoot = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
-               Utils->TreeRoot->AddChild(MyRoot);
+               this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(x->SendPass, this->GetTheirChallenge())+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
 
+               // move to the next state, we are now waiting for THEM.
                this->LinkState = WAIT_AUTH_2;
                return true;
        }
 
-       this->SendError("Invalid credentials");
+       this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. umode +s +Ll)");
        ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
        return false;
 }