X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=f27fe8889f42611d9df7c211a4ca252c2a0b03a4;hb=9028c48512367394af2f790b53658bc6a197f95e;hp=f4f1e1ace0337681977102d75a12e8aa2a672cdc;hpb=d349f981fbe70fb11e3db4c486f59749ffe74c2b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index f4f1e1ace..f27fe8889 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -59,16 +59,18 @@ static std::string BuildModeList(ModeType type)
 		{
 			std::string mdesc = mh->name;
 			mdesc.push_back('=');
-			if (mh->GetPrefix())
-				mdesc.push_back(mh->GetPrefix());
-			if (mh->GetModeChar())
-				mdesc.push_back(mh->GetModeChar());
+			PrefixMode* pm = mh->IsPrefixMode();
+			if (pm)
+			{
+				if (pm->GetPrefix())
+					mdesc.push_back(pm->GetPrefix());
+			}
+			mdesc.push_back(mh->GetModeChar());
 			modes.push_back(mdesc);
 		}
 	}
-	sort(modes.begin(), modes.end());
-	irc::stringjoiner line(modes);
-	return line.GetJoined();
+	std::sort(modes.begin(), modes.end());
+	return irc::stringjoiner(modes);
 }
 
 void TreeSocket::SendCapabilities(int phase)
@@ -127,7 +129,7 @@ void TreeSocket::SendCapabilities(int phase)
 
 	std::string extra;
 	/* Do we have sha256 available? If so, we send a challenge */
-	if (Utils->ChallengeResponse && (ServerInstance->Modules->Find("m_sha256.so")))
+	if (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256"))
 	{
 		SetOurChallenge(ServerInstance->GenRandomStr(20));
 		extra = " CHALLENGE=" + this->GetOurChallenge();
@@ -147,10 +149,17 @@ void TreeSocket::SendCapabilities(int phase)
 			" MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+
 			" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
 			" MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
+			" MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+
 			extra+
 			" PREFIX="+ServerInstance->Modes->BuildPrefixes()+
-			" CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
-			" USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)
+			" CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)+
+			" 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");
@@ -281,7 +290,7 @@ bool TreeSocket::Capab(const parameterlist &params)
 		}
 		else if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end())
 		{
-			if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MASK_CHANNEL))
+			if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL))
 				reason = "One or more of the channel modes on the remote server are invalid on this server.";
 		}
 
@@ -303,13 +312,13 @@ bool TreeSocket::Capab(const parameterlist &params)
 		}
 		else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end())
 		{
-			if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MASK_USER))
+			if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_USER))
 				reason = "One or more of the user modes on the remote server are invalid on this server.";
 		}
 
 		/* Challenge response, store their challenge for our password */
 		std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
-		if (Utils->ChallengeResponse && (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);
@@ -321,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);
@@ -385,4 +394,3 @@ bool TreeSocket::Capab(const parameterlist &params)
 	}
 	return true;
 }
-