Add checks for AddIOHook failing

[user/henk/code/inspircd.git] / src / modules / extra / m_ssl_gnutls.cpp

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index e7d0fe2ed1ced3c2d6c28767e49466be98ac0c3c..977c27dda6ce230083b3a08d6eb979718557d9b3 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -17,7 +17,7 @@
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
 
-bool isin(int port, std::vector<int> portlist)
+bool isin(int port, const std::vector<int> &portlist)
 {
        for(unsigned int i = 0; i < portlist.size(); i++)
                if(portlist[i] == port)
@@ -66,7 +66,6 @@ class ModuleSSLGnuTLS : public Module
        {
                Srv = Me;
                SrvConf = Srv->GetConfig();
-               Conf = new ConfigReader;
                
                // Not rehashable...because I cba to reduce all the sizes of existing buffers.
                inbufsize = SrvConf->NetBufferSize;
@@ -92,7 +91,6 @@ class ModuleSSLGnuTLS : public Module
                if(param != "ssl")
                        return;
        
-               delete Conf;
                Conf = new ConfigReader;
                
                for(unsigned int i = 0; i < listenports.size(); i++)
@@ -109,12 +107,17 @@ class ModuleSSLGnuTLS : public Module
                        {
                                // Get the port we're meant to be listening on with SSL
                                unsigned int port = Conf->ReadInteger("bind", "port", i, true);
-                               SrvConf->AddIOHook(port, this);
-                               
-                               // We keep a record of which ports we're listening on with SSL
-                               listenports.push_back(port);
+                               if(SrvConf->AddIOHook(port, this))
+                               {
+                                       // We keep a record of which ports we're listening on with SSL
+                                       listenports.push_back(port);
                                
-                               log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port);
+                                       log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port);
+                               }
+                               else
+                               {
+                                       log(DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", port);
+                               }
                        }
                }