So much stuff changed in this one, i forgot most of it.

Oh yeah, main thing is ModeHandler and ModeWatcher classes now take an InspIRCd* to their constructor


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

2 files changed, 12 insertions, 6 deletions

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 9bb92fd61..a5cdaf3e0 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -48,7 +48,7 @@ class ModuleSSLGnuTLS : public Module
 
 	char* dummy;
 	
-	CullList culllist;
+	CullList* culllist;
 	
 	std::vector<int> listenports;
 	
@@ -70,6 +70,8 @@ class ModuleSSLGnuTLS : public Module
 		: Module::Module(Me)
 	{
 		Srv = Me;
+
+		culllist = new CullList(ServerInstance);
 		
 		// Not rehashable...because I cba to reduce all the sizes of existing buffers.
 		inbufsize = ServerInstance->Config->NetBufferSize;
@@ -196,6 +198,7 @@ class ModuleSSLGnuTLS : public Module
 		gnutls_dh_params_deinit(dh_params);
 		gnutls_certificate_free_credentials(x509_cred);
 		gnutls_global_deinit();
+		delete culllist;
 	}
 	
 	virtual void OnCleanup(int target_type, void* item)
@@ -209,7 +212,7 @@ class ModuleSSLGnuTLS : public Module
 				// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
 				// Potentially there could be multiple SSL modules loaded at once on different ports.
 				log(DEBUG, "m_ssl_gnutls.so: Adding user %s to cull list", user->nick);
-				culllist.AddItem(user, "SSL module unloading");
+				culllist->AddItem(user, "SSL module unloading");
 			}
 		}
 	}
@@ -219,7 +222,7 @@ class ModuleSSLGnuTLS : public Module
 		if(mod == this)
 		{
 			// We're being unloaded, kill all the users added to the cull list in OnCleanup
-			int numusers = culllist.Apply();
+			int numusers = culllist->Apply();
 			log(DEBUG, "m_ssl_gnutls.so: Killed %d users for unload of GnuTLS SSL module", numusers);
 			
 			for(unsigned int i = 0; i < listenports.size(); i++)
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index f9f38fc17..7d10b78be 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -62,7 +62,7 @@ class ModuleSSLOpenSSL : public Module
 	Server* Srv;
 	ConfigReader* Conf;
 	
-	CullList culllist;
+	CullList* culllist;
 	
 	std::vector<int> listenports;
 	
@@ -85,6 +85,8 @@ class ModuleSSLOpenSSL : public Module
 		: Module::Module(Me)
 	{
 		Srv = Me;
+
+		culllist = new CullList(ServerInstance);
 		
 		// Not rehashable...because I cba to reduce all the sizes of existing buffers.
 		inbufsize = ServerInstance->Config->NetBufferSize;
@@ -220,6 +222,7 @@ class ModuleSSLOpenSSL : public Module
 	virtual ~ModuleSSLOpenSSL()
 	{
 		SSL_CTX_free(ctx);
+		delete culllist;
 	}
 	
 	virtual void OnCleanup(int target_type, void* item)
@@ -233,7 +236,7 @@ class ModuleSSLOpenSSL : public Module
 				// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
 				// Potentially there could be multiple SSL modules loaded at once on different ports.
 				log(DEBUG, "m_ssl_openssl.so: Adding user %s to cull list", user->nick);
-				culllist.AddItem(user, "SSL module unloading");
+				culllist->AddItem(user, "SSL module unloading");
 			}
 		}
 	}
@@ -243,7 +246,7 @@ class ModuleSSLOpenSSL : public Module
 		if(mod == this)
 		{
 			// We're being unloaded, kill all the users added to the cull list in OnCleanup
-			int numusers = culllist.Apply();
+			int numusers = culllist->Apply();
 			log(DEBUG, "m_ssl_openssl.so: Killed %d users for unload of OpenSSL SSL module", numusers);
 			
 			for(unsigned int i = 0; i < listenports.size(); i++)