Added more verbose error output during link

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

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index db529e08ed2989f51cc6eb513cd14abe133c6818..604c081d8f6421dd4c3fdbad791d5cae04236abc 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -95,8 +95,6 @@ extern int MODCOUNT;
 enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED };
 
 /* We need to import these from the core for use in netbursts */
-/*typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;*/
 extern user_hash clientlist;
 extern chan_hash chanlist;
 
@@ -571,6 +569,7 @@ class TreeSocket : public InspSocket
                : InspSocket(newfd, ip)
        {
                this->LinkState = WAIT_AUTH_1;
+               this->SendCapabilities();
        }
 
        void InitAES(std::string key,std::string SName)
@@ -611,6 +610,7 @@ class TreeSocket : public InspSocket
                        {
                                if (x->Name == this->myhost)
                                {
+                                       this->SendCapabilities();
                                        if (x->EncryptionKey != "")
                                        {
                                                if (!(x->EncryptionKey.length() == 16 || x->EncryptionKey.length() == 24 || x->EncryptionKey.length() == 32))
@@ -679,6 +679,56 @@ class TreeSocket : public InspSocket
                }
        }
 
+       std::string MyCapabilities()
+       {
+               ServerConfig* Config = Srv->GetConfig();
+               std::vector<std::string> modlist;
+               std::string capabilities = "";
+
+                for (int i = 0; i <= MODCOUNT; i++)
+                {
+                       if ((modules[i]->GetVersion().Flags & VF_STATIC) || (modules[i]->GetVersion().Flags & VF_COMMON))
+                               modlist.push_back(Config->module_names[i]);
+                }
+               sort(modlist.begin(),modlist.end());
+               for (unsigned int i = 0; i < modlist.size(); i++)
+               {
+                       if (i)
+                               capabilities = capabilities + ",";
+                       capabilities = capabilities + modlist[i];
+               }
+               return capabilities;
+       }
+       
+       void SendCapabilities()
+       {
+               this->WriteLine("CAPAB "+MyCapabilities());
+       }
+
+       bool Capab(std::deque<std::string> params)
+       {
+               if (params.size() != 1)
+               {
+                       this->WriteLine("ERROR :Invalid number of parameters for CAPAB");
+                       return false;
+               }
+               if (params[0] != this->MyCapabilities())
+               {
+                       std::string quitserver = this->myhost;
+                       if (this->InboundServerName != "")
+                       {
+                               quitserver = this->InboundServerName;
+                       }
+                       WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str());
+                       WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str());
+                       WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str());
+                       WriteOpers("*** These lists must match exactly on both servers. Please correct these errors, and try again.");
+                       this->WriteLine("ERROR :CAPAB mismatch; My capabilities: '"+this->MyCapabilities()+"'");
+                       return false;
+               }
+               return true;
+       }
+
        /* This function forces this server to quit, removing this server
         * and any users on it (and servers and users below that, etc etc).
         * It's very slow and pretty clunky, but luckily unless your network
@@ -715,7 +765,7 @@ class TreeSocket : public InspSocket
         */
        void Squit(TreeServer* Current,std::string reason)
        {
-               if (Current)
+               if ((Current) && (Current != TreeRoot))
                {
                        std::deque<std::string> params;
                        params.push_back(Current->GetName());
@@ -1180,12 +1230,16 @@ class TreeSocket : public InspSocket
                                        char out[1024];
                                        char result[1024];
                                        log(DEBUG,"Original string '%s'",ret.c_str());
-                                       int nbytes = from64tobits(out, ret.c_str(), 1024);
-                                       log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes);
-                                       ctx->Decrypt(out, result, nbytes, 0);
-                                       for (int t = 0; t < nbytes; t++)
-                                               if (result[t] == '\7') result[t] = 0;
-                                       ret = result;
+                                       /* ERROR is still allowed unencryped */
+                                       if (ret.substr(0,7) != "ERROR :")
+                                       {
+                                               int nbytes = from64tobits(out, ret.c_str(), 1024);
+                                               log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes);
+                                               ctx->Decrypt(out, result, nbytes, 0);
+                                               for (int t = 0; t < nbytes; t++)
+                                                       if (result[t] == '\7') result[t] = 0;
+                                               ret = result;
+                                       }
                                }
                                if (!this->ProcessLine(ret))
                                {
@@ -1776,6 +1830,10 @@ class TreeSocket : public InspSocket
                                        this->WriteLine("ERROR :Client connections to this port are prohibited.");
                                        return false;
                                }
+                               else if (command == "CAPAB")
+                               {
+                                       return this->Capab(params);
+                               }
                                else
                                {
                                        this->WriteLine("ERROR :Invalid command in negotiation phase.");
@@ -1809,6 +1867,10 @@ class TreeSocket : public InspSocket
                                {
                                        return this->Error(params);
                                }
+                               else if (command == "CAPAB")
+                               {
+                                       return this->Capab(params);
+                               }
                                
                        break;
                        case LISTENER:
@@ -2045,6 +2107,7 @@ class TreeSocket : public InspSocket
                {
                        Squit(s,"Remote host closed the connection");
                }
+               WriteOpers("Server '\2%s\2[%s]' closed the connection.",quitserver.c_str(),this->GetIP().c_str());
        }
 
        virtual int OnIncomingConnection(int newsock, char* ip)