Fix this so it works properly, and removes the descriptions on unload (when the socke...

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

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index e5c3160352f63af5c9cddc79234dd905b7a8dc82..fbd8097427eab69dedce52c28e53ee38525b1c10 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -141,7 +141,7 @@ class ModuleSSLGnuTLS : public Module
                                        {
                                                listenports.push_back(portno);
                                                for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++)
-                                                       if (ServerInstance->Config->ports[i])
+                                                       if (ServerInstance->Config->ports[i] == portno)
                                                                ServerInstance->Config->openSockfd[i]->SetDescription("ssl");
                                                ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", portno);
                                        }
@@ -259,7 +259,12 @@ class ModuleSSLGnuTLS : public Module
                        ServerInstance->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++)
+                       {
                                ServerInstance->Config->DelIOHook(listenports[i]);
+                               for (unsigned int j = 0; j < ServerInstance->stats->BoundPortCount; j++)
+                                       if (ServerInstance->Config->ports[j] == listenports[i])
+                                               ServerInstance->Config->openSockfd[j]->SetDescription("plaintext");
+                       }
                }
        }
        

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index c5b6d1c62a794ef4c650b43bd724315934c06a30..ca690fb8f5e976f64f0edf3951af9a0b7180787c 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -165,7 +165,7 @@ class ModuleSSLOpenSSL : public Module
                                        {
                                                listenports.push_back(portno);
                                                for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++)
-                                                       if (ServerInstance->Config->ports[i])
+                                                       if (ServerInstance->Config->ports[i] == portno)
                                                                ServerInstance->Config->openSockfd[i]->SetDescription("ssl");
                                                ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno);
                                        }
@@ -293,7 +293,12 @@ class ModuleSSLOpenSSL : public Module
                        ServerInstance->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++)
+                       {
                                ServerInstance->Config->DelIOHook(listenports[i]);
+                               for (unsigned int j = 0; j < ServerInstance->stats->BoundPortCount; j++)
+                                       if (ServerInstance->Config->ports[j] == listenports[i])
+                                               ServerInstance->Config->openSockfd[j]->SetDescription("plaintext");
+                       }
                }
        }