X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=047808c2944e9155598e1ab6dfe71ff566d25ab6;hb=3ccae741b8c60acc2d95f2dc54d7e69014090807;hp=fe673f5c313339e688443dcfea9f123a7162be77;hpb=f7eabed15819e7a3316b0ab2dc8a28f59f25ce2c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index fe673f5c3..047808c29 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -69,7 +69,7 @@ static std::string BuildModeList(ModeType type)
 			modes.push_back(mdesc);
 		}
 	}
-	sort(modes.begin(), modes.end());
+	std::sort(modes.begin(), modes.end());
 	return irc::stringjoiner(modes);
 }
 
@@ -129,7 +129,7 @@ void TreeSocket::SendCapabilities(int phase)
 
 	std::string extra;
 	/* Do we have sha256 available? If so, we send a challenge */
-	if (ServerInstance->Modules->Find("m_sha256.so"))
+	if (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256"))
 	{
 		SetOurChallenge(ServerInstance->GenRandomStr(20));
 		extra = " CHALLENGE=" + this->GetOurChallenge();
@@ -153,7 +153,13 @@ void TreeSocket::SendCapabilities(int phase)
 			extra+
 			" PREFIX="+ServerInstance->Modes->BuildPrefixes()+
 			" CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)+
-			" USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)
+			" USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_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")
 			);
 
 	this->WriteLine("CAPAB END");
@@ -312,7 +318,7 @@ bool TreeSocket::Capab(const parameterlist &params)
 
 		/* Challenge response, store their challenge for our password */
 		std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
-		if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so")))
+		if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256")))
 		{
 			/* Challenge-response is on now */
 			this->SetTheirChallenge(n->second);
@@ -324,7 +330,7 @@ bool TreeSocket::Capab(const parameterlist &params)
 		}
 		else
 		{
-			/* They didnt specify a challenge or we don't have m_sha256.so, we use plaintext */
+			// They didn't specify a challenge or we don't have sha256, we use plaintext
 			if (this->LinkState == CONNECTING)
 			{
 				this->SendCapabilities(2);
@@ -380,8 +386,8 @@ bool TreeSocket::Capab(const parameterlist &params)
 			std::string::size_type equals = item.find('=');
 			if (equals != std::string::npos)
 			{
-				std::string var = item.substr(0, equals);
-				std::string value = item.substr(equals+1, item.length());
+				std::string var(item, 0, equals);
+				std::string value(item, equals+1);
 				capab->CapKeys[var] = value;
 			}
 		}