modulemanger: check dependencies correctly

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

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index cd8564892026e2b03463c61f389426a64918450d..66d448e55d1a837b30b82cf728e068d85a7aef38 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -21,10 +21,13 @@
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-
 std::string TreeSocket::MyModules(int filter)
 {
        std::vector<std::string> modlist = this->ServerInstance->Modules->GetAllModuleNames(filter);
+
+       if (filter == VF_COMMON && proto_version != ProtocolVersion)
+               CompatAddModules(modlist);
+
        std::string capabilities;
        sort(modlist.begin(),modlist.end());
        for (unsigned int i = 0; i < modlist.size(); i++)
@@ -36,16 +39,20 @@ std::string TreeSocket::MyModules(int filter)
        return capabilities;
 }
 
-void TreeSocket::SendCapabilities()
+void TreeSocket::SendCapabilities(int phase)
 {
-       if (sentcapab)
+       if (capab_phase >= phase)
+               return;
+
+       if (capab_phase < 1 && phase >= 1)
+               WriteLine("CAPAB START " + ConvToStr(ProtocolVersion));
+
+       capab_phase = phase;
+       if (phase < 2)
                return;
 
-       sentcapab = true;
        irc::commasepstream modulelist(MyModules(VF_COMMON));
        irc::commasepstream optmodulelist(MyModules(VF_OPTCOMMON));
-       this->WriteLine("CAPAB START");
-
        /* Send module names, split at 509 length */
        std::string item;
        std::string line = "CAPAB MODULES ";
@@ -160,6 +167,9 @@ bool TreeSocket::Capab(const parameterlist &params)
                ModuleList.clear();
                OptModuleList.clear();
                CapKeys.clear();
+               if (params.size() > 1)
+                       proto_version = atoi(params[1].c_str());
+               SendCapabilities(2);
        }
        else if (params[0] == "END")
        {
@@ -192,13 +202,23 @@ bool TreeSocket::Capab(const parameterlist &params)
                        {
                                reason = "Optional Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
                        }
-                       else
+                       else if (Utils->AllowOptCommon)
                        {
                                ServerInstance->SNO->WriteToSnoMask('l',
                                        "Optional module lists do not match, some commands may not work globally.%s%s%s%s",
                                        diffIneed.length() ? " Not loaded here:" : "", diffIneed.c_str(),
                                        diffUneed.length() ? " Not loaded there:" : "", diffUneed.c_str());
                        }
+                       else
+                       {
+                               reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set.";
+                               if (diffIneed.length())
+                                       reason += " Not loaded here:" + diffIneed;
+                               if (diffUneed.length())
+                                       reason += " Not loaded there:" + diffUneed;
+                               this->SendError("CAPAB negotiation failed: "+reason);
+                               return false;
+                       }
                }
 
                if (this->CapKeys.find("PROTOCOL") == this->CapKeys.end())
@@ -207,10 +227,10 @@ bool TreeSocket::Capab(const parameterlist &params)
                }
                else
                {
-                       int otherProto = atoi(CapKeys.find("PROTOCOL")->second.c_str());
-                       if (otherProto < MinCompatProtocol)
+                       proto_version = atoi(CapKeys.find("PROTOCOL")->second.c_str());
+                       if (proto_version < MinCompatProtocol)
                        {
-                               reason = "Server is using protocol version " + ConvToStr(otherProto) +
+                               reason = "Server is using protocol version " + ConvToStr(proto_version) +
                                        " which is too old to link with this server (version " + ConvToStr(ProtocolVersion)
                                        + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")");
                        }
@@ -234,7 +254,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        this->SetTheirChallenge(n->second);
                        if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING))
                        {
-                               this->SendCapabilities();
+                               this->SendCapabilities(2);
                                this->WriteLine(std::string("SERVER ")+this->ServerInstance->Config->ServerName+" "+this->MakePass(OutboundPass, this->GetTheirChallenge())+" 0 "+
                                                ServerInstance->Config->GetSID()+" :"+this->ServerInstance->Config->ServerDesc);
                        }
@@ -244,7 +264,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        /* They didnt specify a challenge or we don't have m_sha256.so, we use plaintext */
                        if (this->LinkState == CONNECTING)
                        {
-                               this->SendCapabilities();
+                               this->SendCapabilities(2);
                                this->WriteLine(std::string("SERVER ")+this->ServerInstance->Config->ServerName+" "+OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+this->ServerInstance->Config->ServerDesc);
                        }
                }