X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xmlsocket.cpp;h=ea84851725798b46335da9aa53b280e4c624de15;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=9cb5b02cc798264160462d86007452bc1d0af4ec;hpb=921ff55ce1bd070388770945da3359f9dd6f6fe3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_xmlsocket.cpp b/src/modules/m_xmlsocket.cpp index 9cb5b02cc..ea8485172 100644 --- 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 @@ -11,84 +11,73 @@ * --------------------------------------------------- */ -#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 */ - class ModuleXMLSocket : public Module { - ConfigReader* Conf; - - std::vector listenports; - int clientactive; + std::vector listenports; public: - InspIRCd* PublicInstance; - ModuleXMLSocket(InspIRCd* Me) - : Module::Module(Me), PublicInstance(Me) + : Module(Me) { OnRehash(NULL,""); + Implementation eventlist[] = { I_OnUnloadModule, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnRehash, I_OnHookUserIO, I_OnCleanup }; + ServerInstance->Modules->Attach(eventlist, this, 6); } - virtual void OnRehash(userrec* user, const std::string ¶m) + bool isin(const std::string &host, int port, const std::vector &portlist) { + if (std::find(portlist.begin(), portlist.end(), "*:" + ConvToStr(port)) != portlist.end()) + return true; - Conf = new ConfigReader(ServerInstance); + if (std::find(portlist.begin(), portlist.end(), ":" + ConvToStr(port)) != portlist.end()) + return true; - for (unsigned int i = 0; i < listenports.size(); i++) - { - ServerInstance->Config->DelIOHook(listenports[i]); - } + return std::find(portlist.begin(), portlist.end(), host + ":" + ConvToStr(port)) != portlist.end(); + } + + virtual void OnRehash(User* user, const std::string ¶m) + { + + Conf = new ConfigReader(ServerInstance); listenports.clear(); - clientactive = 0; for (int i = 0; i < Conf->Enumerate("bind"); i++) { // For each tag - if (((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "xmlsocket", i) == "yes")) + 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); + std::string addr = Conf->ReadValue("bind", "address", i); + irc::portparser portrange(port, false); 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"); - } - 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() @@ -101,28 +90,40 @@ 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 (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(1, 2, 0, 0, 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) { - userrec* user = dynamic_cast(ServerInstance->FindDescriptor(fd)); + User* user = dynamic_cast(ServerInstance->FindDescriptor(fd)); if (user == NULL) return -1; @@ -150,13 +151,13 @@ class ModuleXMLSocket : public Module virtual int OnRawSocketWrite(int fd, const char* buffer, int count) { - userrec* user = dynamic_cast(ServerInstance->FindDescriptor(fd)); + User* user = dynamic_cast(ServerInstance->FindDescriptor(fd)); if (user == NULL) return -1; /* We want to alter the buffer, so we have to make a copy */ - char tmpbuffer[count+1]; + char * tmpbuffer = new char[count + 1]; memcpy(tmpbuffer, buffer, count); /* XXX: This will actually generate lines "looking\0\0like\0\0this" @@ -170,31 +171,12 @@ class ModuleXMLSocket : public Module tmpbuffer[n] = 0; user->AddWriteBuf(std::string(tmpbuffer,count)); + delete [] tmpbuffer; return 1; } }; -class ModuleXMLSocketFactory : public ModuleFactory -{ - public: - ModuleXMLSocketFactory() - { - } +MODULE_INIT(ModuleXMLSocket) - ~ModuleXMLSocketFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleXMLSocket(Me); - } -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleXMLSocketFactory; -}