From ab46b96db4d457e6a4f2e978c38b79762cdeb9d5 Mon Sep 17 00:00:00 2001 From: brain Date: Wed, 9 Aug 2006 14:53:19 +0000 Subject: Move socket_ref and module_sockets vectors/arrays into InspIRCd*. These are public members, which InspSocket can modify. (eventually, this will be marshalled safely through some accessors). When constructing an InspSocket you must now provide an InspIRCd* instance to 'attach' the socket to. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4812 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/extra/m_mysql.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules/extra/m_mysql.cpp') diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 79baf170c..eeb803d5a 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -669,9 +669,9 @@ class Notifier : public InspSocket /* Create a socket on a random port. Let the tcp stack allocate us an available port */ #ifdef IPV6 - Notifier(Server* S) : InspSocket("::1", 0, true, 3000), Srv(S) + Notifier(InspIRCd* SI, Server* S) : InspSocket(SI, "::1", 0, true, 3000), Srv(S) #else - Notifier(Server* S) : InspSocket("127.0.0.1", 0, true, 3000), Srv(S) + Notifier(InspIRCd* SI, Server* S) : InspSocket(SI, "127.0.0.1", 0, true, 3000), Srv(S) #endif { uslen = sizeof(sock_us); @@ -681,7 +681,7 @@ class Notifier : public InspSocket } } - Notifier(int newfd, char* ip, Server* S) : InspSocket(newfd, ip), Srv(S) + Notifier(InspIRCd* SI, int newfd, char* ip, Server* S) : InspSocket(SI, newfd, ip), Srv(S) { log(DEBUG,"Constructor of new socket"); } @@ -699,7 +699,7 @@ class Notifier : public InspSocket virtual int OnIncomingConnection(int newsock, char* ip) { log(DEBUG,"Inbound connection on fd %d!",newsock); - Notifier* n = new Notifier(newsock, ip, Srv); + Notifier* n = new Notifier(this->Instance, newsock, ip, Srv); Srv->AddSocket(n); return true; } @@ -797,7 +797,7 @@ class ModuleSQL : public Module currid = 0; SQLModule = this; - MessagePipe = new Notifier(Srv); + MessagePipe = new Notifier(ServerInstance, Srv); Srv->AddSocket(MessagePipe); log(DEBUG,"Bound notifier to 127.0.0.1:%d",MessagePipe->GetPort()); -- cgit v1.2.3