Use ServiceProvider for inter-module dependencies

This will stop dependency chains from preventing module reloads when
it is not actually needed; however, it removes some failsafes that will
need to be reimplemented in order to avoid unmapped vtables.

This deprecates Request as an inter-module signaling mechanism, although
SQL still uses it.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12140 e03df62e-2008-0410-955e-edbf42e46eb7

4 files changed, 28 insertions, 47 deletions

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index b35879cd9..dd577fca7 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -26,6 +26,7 @@ static const char* const forge_common_1201[] = {
 	"m_saquit.so",
 	"m_setident.so",
 	"m_swhois.so",
+	"m_regex_pcre.so"
 };
 
 static std::string wide_newline("\r\n");
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index b5a5fa228..790358d36 100644
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -55,16 +55,13 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
 	 * Note: If m_sha256.so is not loaded, we MUST fall back to plaintext with no
 	 *       HMAC challenge/response.
 	 */
-	Module* sha256 = ServerInstance->Modules->Find("m_sha256.so");
+	HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
 	if (Utils->ChallengeResponse && sha256 && !challenge.empty())
 	{
-		/* XXX: This is how HMAC is supposed to be done:
+		/* This is how HMAC is supposed to be done:
 		 *
 		 * sha256( (pass xor 0x5c) + sha256((pass xor 0x36) + m) )
 		 *
-		 * Note that we are encoding the hex hash, not the binary
-		 * output of the hash which is slightly different to standard.
-		 *
 		 * 5c and 36 were chosen as part of the HMAC standard, because they
 		 * flip the bits in a way likely to strengthen the function.
 		 */
@@ -72,17 +69,28 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
 
 		for (size_t n = 0; n < password.length(); n++)
 		{
-			hmac1 += static_cast<char>(password[n] ^ 0x5C);
-			hmac2 += static_cast<char>(password[n] ^ 0x36);
+			hmac1.push_back(static_cast<char>(password[n] ^ 0x5C));
+			hmac2.push_back(static_cast<char>(password[n] ^ 0x36));
 		}
 
-		hmac2 += challenge;
-		hmac2 = HashRequest(Utils->Creator, sha256, hmac2).hex();
+		if (proto_version >= 1202)
+		{
+			hmac2.append(challenge);
+			std::string hmac = sha256->hexsum(hmac1 + sha256->sum(hmac2));
+
+			return "AUTH:" + hmac;
+		}
+		else
+		{
+			// version 1.2 used a weaker HMAC, using hex output in the intermediate step
+			hmac2.append(challenge);
+			hmac2 = sha256->hexsum(hmac2);
 		
-		std::string hmac = hmac1 + hmac2;
-		hmac = HashRequest(Utils->Creator, sha256, hmac).hex();
+			std::string hmac = hmac1 + hmac2;
+			hmac = sha256->hexsum(hmac);
 
-		return "HMAC-SHA256:"+ hmac;
+			return "HMAC-SHA256:"+ hmac;
+		}
 	}
 	else if (!challenge.empty() && !sha256)
 		ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index fe2cfe9b6..0ed9b28ac 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -33,7 +33,6 @@
 ModuleSpanningTree::ModuleSpanningTree()
 	: max_local(0), max_global(0)
 {
-	ServerInstance->Modules->UseInterface("BufferedSocketHook");
 	Utils = new SpanningTreeUtilities(this);
 	command_rconnect = new CommandRConnect(this, Utils);
 	ServerInstance->AddCommand(command_rconnect);
@@ -781,30 +780,16 @@ void ModuleSpanningTree::OnRehash(User* user)
 
 void ModuleSpanningTree::OnLoadModule(Module* mod)
 {
-	this->RedoConfig(mod);
+	// TODO notify other servers?
 }
 
 void ModuleSpanningTree::OnUnloadModule(Module* mod)
 {
-	this->RedoConfig(mod);
+	// TODO notify other servers?
 }
 
 void ModuleSpanningTree::RedoConfig(Module* mod)
 {
-	/* If m_sha256.so is loaded (we use this for HMAC) or any module implementing a BufferedSocket interface is loaded,
-	 * then we need to re-read our config again taking this into account.
-	 */
-	modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook");
-	bool IsBufferSocketModule = false;
-
-	/* Did we find any modules? */
-	if (ml && std::find(ml->begin(), ml->end(), mod) != ml->end())
-		IsBufferSocketModule = true;
-
-	if (mod->ModuleSourceFile == "m_sha256.so" || IsBufferSocketModule)
-	{
-		Utils->ReadConfiguration();
-	}
 }
 
 // note: the protocol does not allow direct umode +o except
@@ -955,7 +940,6 @@ CullResult ModuleSpanningTree::cull()
 {
 	Utils->cull();
 	ServerInstance->Timers->DelTimer(RefreshTimer);
-	ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
 	return this->Module::cull();
 }
 
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index e41b53583..abed5fc25 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -40,26 +40,14 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, const std::string& shost, in
 	LinkState = CONNECTING;
 	if (!hook.empty())
 	{
-		modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook");
-		if (ml)
+		ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, hook);
+		if (!prov)
 		{
-			for(modulelist::iterator i = ml->begin(); i != ml->end(); ++i)
-			{
-				std::string name = (**i).ModuleSourceFile;
-				int a = name.rfind('_');
-				int b = name.rfind('.');
-				name = name.substr(a+1, b-a-1);
-				if (name == hook)
-				{
-					AddIOHook(*i);
-					goto found;
-				}
-			}
+			SetError("Could not find hook '" + hook + "' for connection to " + ServerName);
+			return;
 		}
-		SetError("Could not find hook '" + hook + "' for connection to " + ServerName);
-		return;
+		AddIOHook(prov->creator);
 	}
-found:
 	DoConnect(shost, iport, maxtime, bindto);
 	Utils->timeoutlist[this] = std::pair<std::string, int>(ServerName, maxtime);
 	SendCapabilities(1);