X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_xmlsocket.cpp;h=bf50fe012ec76a242fb8e8e9b07eccbcce704f2f;hb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;hp=8fcd72a52e1e3d11ae1e5df5e76250825b4aafc8;hpb=19853e96f578224ee95a652420f28bc8a6904b17;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_xmlsocket.cpp b/src/modules/m_xmlsocket.cpp index 8fcd72a52..bf50fe012 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,44 +11,26 @@ * --------------------------------------------------- */ -#include -#include - -#include -#include - -#include "inspircd_config.h" -#include "configreader.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 listenports; - int clientactive; 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 }; + ServerInstance->Modules->Attach(eventlist, this, 4); } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { Conf = new ConfigReader(ServerInstance); @@ -59,12 +41,12 @@ class ModuleXMLSocket : public Module } 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); @@ -72,15 +54,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 { @@ -95,7 +76,7 @@ class ModuleXMLSocket : public Module } } - DELETE(Conf); + delete Conf; } virtual ~ModuleXMLSocket() @@ -109,10 +90,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"); } } } @@ -122,14 +102,10 @@ class ModuleXMLSocket : public Module return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); } - void Implements(char* List) - { - List[I_OnUnloadModule] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnRehash] = 1; - } 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; @@ -141,6 +117,12 @@ class ModuleXMLSocket : public Module else if (result < 1) return 0; + /* XXX: The core is more than happy to split lines purely on an \n + * rather than a \r\n. This is good for us as it means that the size + * of data we are receiving is exactly the same as the size of data + * we asked for, and we dont need to re-implement our own socket + * buffering (See below) + */ for (int n = 0; n < result; n++) if (buffer[n] == 0) buffer[n] = '\n'; @@ -151,44 +133,32 @@ 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; - char tmpbuffer[count+1]; - memcpy(&tmpbuffer, &buffer, count); + /* We want to alter the buffer, so we have to make a copy */ + 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 + * to the client, but it saves us a TON of processing and the need + * to re-implement socket buffering, as the data we are sending is + * exactly the same length as the data we are receiving. + */ for (int n = 0; n < count; n++) if ((tmpbuffer[n] == '\r') || (tmpbuffer[n] == '\n')) tmpbuffer[n] = 0; user->AddWriteBuf(std::string(tmpbuffer,count)); + delete [] tmpbuffer; return 1; } }; -class ModuleXMLSocketFactory : public ModuleFactory -{ - public: - ModuleXMLSocketFactory() - { - } - - ~ModuleXMLSocketFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleXMLSocket(Me); - } -}; - +MODULE_INIT(ModuleXMLSocket) -extern "C" void * init_module( void ) -{ - return new ModuleXMLSocketFactory; -}