Socket engine tweaks to fix a glitch, and improvements to new m_ident

[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 3603f2fb5c5cdbd9a32605cb10dab72dfa7a1174..6d1e99d31b10cbd4f5d69b5abadfcaabca080176 100644 (file)
--- a/src/modules/m_xmlsocket.cpp
+++ b/src/modules/m_xmlsocket.cpp
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides XMLSocket support for clients */
@@ -34,7 +28,7 @@ class ModuleXMLSocket : public Module
                OnRehash(NULL,"");
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
 
                Conf = new ConfigReader(ServerInstance);
@@ -49,7 +43,8 @@ class ModuleXMLSocket : public Module
                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->ReadFlag("bind", "xmlsocket", i)))
+                       std::string x = Conf->ReadValue("bind", "type", i);
+                       if (((x.empty()) || (x == "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);
@@ -112,7 +107,7 @@ class ModuleXMLSocket : public Module
 
        virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
        {
-               userrec* user = dynamic_cast<userrec*>(ServerInstance->FindDescriptor(fd));
+               User* user = dynamic_cast<User*>(ServerInstance->FindDescriptor(fd));
 
                if (user == NULL)
                        return -1;
@@ -140,7 +135,7 @@ class ModuleXMLSocket : public Module
 
        virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
        {
-               userrec* user = dynamic_cast<userrec*>(ServerInstance->FindDescriptor(fd));
+               User* user = dynamic_cast<User*>(ServerInstance->FindDescriptor(fd));
 
                if (user == NULL)
                        return -1;
@@ -167,25 +162,5 @@ class ModuleXMLSocket : public Module
 
 };
 
-class ModuleXMLSocketFactory : public ModuleFactory
-{
- public:
-       ModuleXMLSocketFactory()
-       {
-       }
-
-       ~ModuleXMLSocketFactory()
-       {
-       }
+MODULE_INIT(ModuleXMLSocket)
 
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleXMLSocket(Me);
-       }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleXMLSocketFactory;
-}