We were already sending FMODE +nt after each channel creation to keep services happy...

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

diff --git a/src/modules/m_xmlsocket.cpp b/src/modules/m_xmlsocket.cpp
index 5dc13c7f9218154879411c53c4f84d133d3f208b..face79635ae2d99b80b51724b62d77675c9b146e 100644 (file)
--- a/src/modules/m_xmlsocket.cpp
+++ b/src/modules/m_xmlsocket.cpp
@@ -11,39 +11,23 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include "inspircd_config.h"
-#include "configreader.h"
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
-#include "socket.h"
 #include "hashcomp.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides XMLSocket support for clients */
 
-
 class ModuleXMLSocket : public Module
 {
-
        ConfigReader* Conf;
-
        std::vector<int> listenports;
-       int clientactive;
 
  public:
 
-       InspIRCd* PublicInstance;
-
        ModuleXMLSocket(InspIRCd* Me)
-               : Module::Module(Me), PublicInstance(Me)
+               : Module(Me)
        {
                OnRehash(NULL,"");
        }
@@ -59,12 +43,11 @@ class ModuleXMLSocket : public Module
                }
 
                listenports.clear();
-               clientactive = 0;
 
                for (int i = 0; i < Conf->Enumerate("bind"); i++)
                {
                        // For each <bind> tag
-                       if (((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "xmlsocket", i) == "yes"))
+                       if (((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadFlag("bind", "xmlsocket", i)))
                        {
                                // Get the port we're meant to be listening on with SSL
                                std::string port = Conf->ReadValue("bind", "port", i);
@@ -72,15 +55,14 @@ class ModuleXMLSocket : public Module
                                long portno = -1;
                                while ((portno = portrange.GetToken()))
                                {
-                                       clientactive++;
                                        try
                                        {
                                                if (ServerInstance->Config->AddIOHook(portno, this))
                                                {
                                                        listenports.push_back(portno);
-                                                               for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++)
-                                                               if (ServerInstance->Config->ports[i] == portno)
-                                                                       ServerInstance->Config->openSockfd[i]->SetDescription("xml");
+                                                               for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++)
+                                                               if (ServerInstance->Config->ports[i]->GetPort() == portno)
+                                                                       ServerInstance->Config->ports[i]->SetDescription("xml");
                                                }
                                                else
                                                {
@@ -109,10 +91,9 @@ class ModuleXMLSocket : public Module
                        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])
-                                               if (ServerInstance->Config->openSockfd[j])
-                                                       ServerInstance->Config->openSockfd[j]->SetDescription("plaintext");
+                               for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++)
+                                       if (ServerInstance->Config->ports[j]->GetPort() == listenports[i])
+                                               ServerInstance->Config->ports[j]->SetDescription("plaintext");
                        }
                }
        }
@@ -163,8 +144,8 @@ class ModuleXMLSocket : public Module
                        return -1;
 
                /* We want to alter the buffer, so we have to make a copy */
-               char tmpbuffer[count+1];
-               memcpy(&tmpbuffer, &buffer, count);
+               char * tmpbuffer = new char[count + 1];
+               memcpy(tmpbuffer, buffer, count);
 
                /* XXX: This will actually generate lines "looking\0\0like\0\0this"
                 * rather than lines "looking\0like\0this". This shouldnt be a problem
@@ -177,6 +158,7 @@ class ModuleXMLSocket : public Module
                                tmpbuffer[n] = 0;
 
                user->AddWriteBuf(std::string(tmpbuffer,count));
+               delete [] tmpbuffer;
 
                return 1;
        }
@@ -201,7 +183,7 @@ class ModuleXMLSocketFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleXMLSocketFactory;
 }