Fix memory leak if we send STARTTLS twice, thanks special and psychon

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

diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp
index 1e9c32d26269c1c1bfac35cf8486ef44161d1d46..7b1cb281c2c53651f559b02bedf9f7fb982c3566 100644 (file)
--- a/src/modules/extra/m_ziplink.cpp
+++ b/src/modules/extra/m_ziplink.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
@@ -137,7 +137,7 @@ class izip_session : public classbase
 
 class ModuleZLib : public Module
 {
-       izip_session sessions[MAX_DESCRIPTORS];
+       izip_session* sessions;
 
        /* Used for stats z extensions */
        float total_out_compressed;
@@ -150,30 +150,30 @@ class ModuleZLib : public Module
        ModuleZLib(InspIRCd* Me)
                : Module::Module(Me)
        {
-               ServerInstance->PublishInterface("InspSocketHook", this);
+               ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
+
+               sessions = new izip_session[ServerInstance->SE->GetMaxFds()];
 
                total_out_compressed = total_in_compressed = 0;
                total_out_uncompressed = total_out_uncompressed = 0;
+               Implementation eventlist[] = { I_OnRawSocketConnect, I_OnRawSocketAccept, I_OnRawSocketClose, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnStats, I_OnRequest };
+               ServerInstance->Modules->Attach(eventlist, this, 7);
        }
 
        virtual ~ModuleZLib()
        {
-               ServerInstance->UnpublishInterface("InspSocketHook", this);
+               ServerInstance->Modules->UnpublishInterface("BufferedSocketHook", this);
+               delete[] sessions;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 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] = 1;
-               List[I_OnStats] = List[I_OnRequest] = 1;
-       }
 
-       /* Handle InspSocketHook API requests */
-       virtual char* OnRequest(Request* request)
+       /* Handle BufferedSocketHook API requests */
+       virtual const char* OnRequest(Request* request)
        {
                ISHRequest* ISR = (ISHRequest*)request;
                if (strcmp("IS_NAME", request->GetId()) == 0)
@@ -184,10 +184,10 @@ class ModuleZLib : public Module
                else if (strcmp("IS_HOOK", request->GetId()) == 0)
                {
                        /* Attach to an inspsocket */
-                       char* ret = "OK";
+                       const char* ret = "OK";
                        try
                        {
-                               ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                               ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? "OK" : NULL;
                        }
                        catch (ModuleException& e)
                        {
@@ -198,7 +198,7 @@ class ModuleZLib : public Module
                else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
                {
                        /* Detatch from an inspsocket */
-                       return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                       return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? "OK" : NULL;
                }
                else if (strcmp("IS_HSDONE", request->GetId()) == 0)
                {
@@ -218,7 +218,7 @@ class ModuleZLib : public Module
        }
 
        /* Handle stats z (misc stats) */
-       virtual int OnStats(char symbol, userrec* user, string_list &results)
+       virtual int OnStats(char symbol, User* user, string_list &results)
        {
                if (symbol == 'z')
                {
@@ -419,13 +419,13 @@ class ModuleZLib : public Module
                                        return 0;
                                else
                                {
-                                       session->outbuf = "";
+                                       session->outbuf.clear();
                                        return 0;
                                }
                        }
                        else
                        {
-                               session->outbuf = "";
+                               session->outbuf.clear();
                                return 0;
                        }
                }
@@ -441,32 +441,12 @@ class ModuleZLib : public Module
                if (session->status == IZIP_OPEN)
                {
                        session->status = IZIP_CLOSED;
-                       session->outbuf = "";
+                       session->outbuf.clear();
                        delete session->inbuf;
                }
        }
 
 };
 
-class ModuleZLibFactory : public ModuleFactory
-{
- public:
-       ModuleZLibFactory()
-       {
-       }
-       
-       ~ModuleZLibFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleZLib(Me);
-       }
-};
-
+MODULE_INIT(ModuleZLib)
 
-extern "C" void * init_module( void )
-{
-       return new ModuleZLibFactory;
-}