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

[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 64cfef9d766bc6cee31e7cd114c245c65db1d397..7b64358980d6bb41e49dbadeee5b437ea327fd5b 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -1,22 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 
 #include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
+#include "link.h"
 #include "main.h"
 
 std::string TreeSocket::MyModules(int filter)
@@ -28,12 +37,12 @@ std::string TreeSocket::MyModules(int filter)
 
        std::string capabilities;
        sort(modlist.begin(),modlist.end());
-       for (unsigned int i = 0; i < modlist.size(); i++)
+       for (std::vector<std::string>::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
        {
-               if (i)
+               if (i != modlist.begin())
                        capabilities.push_back(proto_version > 1201 ? ' ' : ',');
-               capabilities.append(modlist[i]);
-               Module* m = ServerInstance->Modules->Find(modlist[i]);
+               capabilities.append(*i);
+               Module* m = ServerInstance->Modules->Find(*i);
                if (m && proto_version > 1201)
                {
                        Version v = m->GetVersion();
@@ -123,10 +132,6 @@ void TreeSocket::SendCapabilities(int phase)
        WriteLine("CAPAB CHANMODES :" + BuildModeList(MODETYPE_CHANNEL));
        WriteLine("CAPAB USERMODES :" + BuildModeList(MODETYPE_USER));
 
-       int ip6 = 0;
-#ifdef IPV6
-       ip6 = 1;
-#endif
        std::string extra;
        /* Do we have sha256 available? If so, we send a challenge */
        if (Utils->ChallengeResponse && (ServerInstance->Modules->Find("m_sha256.so")))
@@ -134,6 +139,8 @@ void TreeSocket::SendCapabilities(int phase)
                SetOurChallenge(ServerInstance->GenRandomStr(20));
                extra = " CHALLENGE=" + this->GetOurChallenge();
        }
+       if (proto_version < 1202)
+               extra += ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL) ? " HALFOP=1" : " HALFOP=0";
 
        this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
                        ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+
@@ -145,12 +152,17 @@ void TreeSocket::SendCapabilities(int phase)
                        " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+
                        " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
                        " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
-                       " IP6NATIVE="+ConvToStr(ip6)+
                        " IP6SUPPORT=1"+
                        " PROTOCOL="+ConvToStr(ProtocolVersion)+extra+
                        " PREFIX="+ServerInstance->Modes->BuildPrefixes()+
                        " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
                        " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+
+                       // XXX: Advertise the presence or absence of m_globops in CAPAB CAPABILITIES.
+                       // Services want to know about it, and since m_globops was not marked as VF_(OPT)COMMON
+                       // in 2.0, we advertise it here to not break linking to previous versions.
+                       // Protocol version 1201 (1.2) does not have this issue because we advertise m_globops
+                       // to 1201 protocol servers irrespectively of its module flags.
+                       (ServerInstance->Modules->Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0")+
                        " SVSPART=1");
 
        this->WriteLine("CAPAB END");
@@ -315,8 +327,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING))
                        {
                                this->SendCapabilities(2);
-                               this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(capab->OutboundPass, this->GetTheirChallenge())+" 0 "+
-                                               ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+                               this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
                        }
                }
                else
@@ -325,7 +336,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        if (this->LinkState == CONNECTING)
                        {
                                this->SendCapabilities(2);
-                               this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+capab->OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+                               this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
                        }
                }