Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

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

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 7d6f24cb3493400b8767168f502d179eb70d1b13..667b2a5cd3ab0665cd7cc0491527d24eacab8054 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,10 +16,6 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#ifdef WINDOWS
-#include <openssl/applink.c>
-#endif
-
 #include "configreader.h"
 #include "users.h"
 #include "channels.h"
@@ -153,13 +149,13 @@ class ModuleSSLOpenSSL : public Module
 
                // Needs the flag as it ignores a plain /rehash
                OnRehash(NULL,"ssl");
+               Implementation eventlist[] = { I_OnRawSocketConnect, I_OnRawSocketAccept, I_OnRawSocketClose, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnCleanup, I_On005Numeric,
+                       I_OnBufferFlushed, I_OnRequest, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUnloadModule, I_OnRehash, I_OnWhois, I_OnPostConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 15);
        }
 
        virtual void OnRehash(User* user, const std::string &param)
        {
-               if (param != "ssl")
-                       return;
-
                ConfigReader Conf(ServerInstance);
 
                for (unsigned int i = 0; i < listenports.size(); i++)
@@ -171,14 +167,14 @@ class ModuleSSLOpenSSL : public Module
                clientactive = 0;
                sslports.clear();
 
-               for (int i = 0; i < Conf.Enumerate("bind"); i++)
+               for (int index = 0; index < Conf.Enumerate("bind"); index++)
                {
                        // For each <bind> tag
-                       std::string x = Conf.ReadValue("bind", "type", i);
-                       if (((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", i) == "openssl"))
+                       std::string x = Conf.ReadValue("bind", "type", index);
+                       if (((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", index) == "openssl"))
                        {
                                // Get the port we're meant to be listening on with SSL
-                               std::string port = Conf.ReadValue("bind", "port", i);
+                               std::string port = Conf.ReadValue("bind", "port", index);
                                irc::portparser portrange(port, false);
                                long portno = -1;
                                while ((portno = portrange.GetToken()))
@@ -211,6 +207,11 @@ class ModuleSSLOpenSSL : public Module
                if (!sslports.empty())
                        sslports.erase(sslports.end() - 1);
 
+               if (param != "ssl")
+               {
+                       return;
+               }
+
                std::string confdir(ServerInstance->ConfigFileName);
                // +1 so we the path ends with a /
                confdir = confdir.substr(0, confdir.find_last_of('/') + 1);
@@ -341,13 +342,8 @@ class ModuleSSLOpenSSL : public Module
                return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = List[I_On005Numeric] = 1;
-               List[I_OnBufferFlushed] = List[I_OnRequest] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1;
-       }
 
-       virtual char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
                ISHRequest* ISR = (ISHRequest*)request;
                if (strcmp("IS_NAME", request->GetId()) == 0)
@@ -356,10 +352,10 @@ class ModuleSSLOpenSSL : public Module
                }
                else if (strcmp("IS_HOOK", request->GetId()) == 0)
                {
-                       char* ret = "OK";
+                       const char* ret = "OK";
                        try
                        {
-                               ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                               ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? "OK" : NULL;
                        }
                        catch (ModuleException &e)
                        {
@@ -370,15 +366,15 @@ class ModuleSSLOpenSSL : public Module
                }
                else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
                {
-                       return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                       return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? "OK" : NULL;
                }
                else if (strcmp("IS_HSDONE", request->GetId()) == 0)
                {
                        if (ISR->Sock->GetFd() < 0)
-                               return (char*)"OK";
+                               return "OK";
 
                        issl_session* session = &sessions[ISR->Sock->GetFd()];
-                       return (session->status == ISSL_HANDSHAKING) ? NULL : (char*)"OK";
+                       return (session->status == ISSL_HANDSHAKING) ? NULL : "OK";
                }
                else if (strcmp("IS_ATTACH", request->GetId()) == 0)
                {
@@ -784,8 +780,8 @@ class ModuleSSLOpenSSL : public Module
                        metadata->push_back("ON");              // The value to send
                        Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
                        event->Send(ServerInstance);            // Trigger the event. We don't care what module picks it up.
-                       DELETE(event);
-                       DELETE(metadata);
+                       delete event;
+                       delete metadata;
 
                        VerifyCertificate(&sessions[user->GetFd()], user);
                        if (sessions[user->GetFd()].sess)