Keep multiple IOHookProvider references in class ListenSocket

This adds the <bind:hook> config option which works together with <bind:ssl>

2 files changed, 9 insertions, 4 deletions

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 0b6b2e32b..64bef70d1 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -78,8 +78,8 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 	{
 		ServerInstance->Timers.AddTimer(this);
 
-		if (via->iohookprov)
-			via->iohookprov->OnAccept(this, client, server);
+		if ((!via->iohookprovs.empty()) && (via->iohookprovs.back()))
+			via->iohookprovs.back()->OnAccept(this, client, server);
 	}
 
 	~HttpServerSocket()
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 2198d6208..e1642a086 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -60,8 +60,13 @@ TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* cl
 	capab = new CapabData;
 	capab->capab_phase = 0;
 
-	if (via->iohookprov)
-		via->iohookprov->OnAccept(this, client, server);
+	for (ListenSocket::IOHookProvList::iterator i = via->iohookprovs.begin(); i != via->iohookprovs.end(); ++i)
+	{
+		ListenSocket::IOHookProvRef& iohookprovref = *i;
+		if (iohookprovref)
+			iohookprovref->OnAccept(this, client, server);
+	}
+
 	SendCapabilities(1);
 
 	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, 30);