TRE regex provider (the same engine used by Unreal 3.2)

[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 1fc9d337f2d0a1f7ce968d23dea938b232c46e81..cc14dee97660ccb8f5ee1d72d295a9d1f0430b23 100644 (file)
--- a/src/modules/m_xmlsocket.cpp
+++ b/src/modules/m_xmlsocket.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
@@ -18,7 +18,7 @@
 class ModuleXMLSocket : public Module
 {
        ConfigReader* Conf;
-       std::vector<int> listenports;
+       std::vector<std::string> listenports;
 
  public:
 
@@ -26,8 +26,19 @@ class ModuleXMLSocket : public Module
                : Module(Me)
        {
                OnRehash(NULL,"");
-               Implementation eventlist[] = { I_OnUnloadModule, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnUnloadModule, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnRehash, I_OnHookUserIO, I_OnCleanup };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
+       }
+
+       bool isin(const std::string &host, int port, const std::vector<std::string> &portlist)
+       {
+               if (std::find(portlist.begin(), portlist.end(), "*:" + ConvToStr(port)) != portlist.end())
+                       return true;
+
+               if (std::find(portlist.begin(), portlist.end(), ":" + ConvToStr(port)) != portlist.end())
+                       return true;
+
+               return std::find(portlist.begin(), portlist.end(), host + ":" + ConvToStr(port)) != portlist.end();
        }
 
        virtual void OnRehash(User* user, const std::string &param)
@@ -35,11 +46,6 @@ class ModuleXMLSocket : public Module
 
                Conf = new ConfigReader(ServerInstance);
 
-               for (unsigned int i = 0; i < listenports.size(); i++)
-               {
-                       ServerInstance->Config->DelIOHook(listenports[i]);
-               }
-
                listenports.clear();
 
                for (int i = 0; i < Conf->Enumerate("bind"); i++)
@@ -50,33 +56,28 @@ class ModuleXMLSocket : public Module
                        {
                                // Get the port we're meant to be listening on with SSL
                                std::string port = Conf->ReadValue("bind", "port", i);
+                               std::string addr = Conf->ReadValue("bind", "address", i);
+
                                irc::portparser portrange(port, false);
                                long portno = -1;
                                while ((portno = portrange.GetToken()))
                                {
                                        try
                                        {
-                                               if (ServerInstance->Config->AddIOHook(portno, this))
-                                               {
-                                                       listenports.push_back(portno);
-                                                               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
-                                               {
-                                                       ServerInstance->Log(DEFAULT, "m_xmlsocket.so: FAILED to enable XMLSocket on port %d, maybe you have another similar module loaded?", portno);
-                                               }
+                                               listenports.push_back(addr + ":" + ConvToStr(portno));
+                                               for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++)
+                                                       if ((ServerInstance->Config->ports[j]->GetPort() == portno) && (ServerInstance->Config->ports[j]->GetIP() == addr))
+                                                               ServerInstance->Config->ports[j]->SetDescription("xml");
                                        }
                                        catch (ModuleException &e)
                                        {
-                                               ServerInstance->Log(DEFAULT, "m_xmlsocket.so: FAILED to enable XMLSocket on port %d: %s. Maybe it's already hooked by the same port on a different IP, or you have another similar module loaded?", portno, e.GetReason());
+                                               ServerInstance->Logs->Log("m_xmlsocket",DEFAULT, "m_xmlsocket.so: FAILED to enable XMLSocket on port %ld: %s. Maybe you have another similar module loaded?", portno, e.GetReason());
                                        }
                                }
                        }
                }
 
-               DELETE(Conf);
+               delete Conf;
        }
 
        virtual ~ModuleXMLSocket()
@@ -89,22 +90,35 @@ class ModuleXMLSocket : public Module
                {
                        for(unsigned int i = 0; i < listenports.size(); i++)
                        {
-                               ServerInstance->Config->DelIOHook(listenports[i]);
                                for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++)
-                                       if (ServerInstance->Config->ports[j]->GetPort() == listenports[i])
+                                       if (listenports[i] == (ServerInstance->Config->ports[j]->GetIP()+":"+ConvToStr(ServerInstance->Config->ports[j]->GetPort())))
                                                ServerInstance->Config->ports[j]->SetDescription("plaintext");
                        }
                }
        }
 
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               if(target_type == TYPE_USER)
+               {
+                       User* user = (User*)item;
+                       if(user->io == this)
+                               user->io = NULL;
+               }
+       }
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
-       void Implements(char* List)
+       virtual void OnHookUserIO(User* user, const std::string &targetip)
        {
-               List[I_OnUnloadModule] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnRehash] = 1;
+               if (!user->io && isin(targetip,user->GetPort(),listenports))
+               {
+                       /* Hook the user with our module */
+                       user->io = this;
+               }
        }
 
        virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)