* | 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
* ---------------------------------------------------
*/
-#include <string>
-#include <vector>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#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<int> 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);
}
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"))
+ 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);
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
{
}
}
- DELETE(Conf);
+ delete Conf;
}
virtual ~ModuleXMLSocket()
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");
}
}
}
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<userrec*>(ServerInstance->FindDescriptor(fd));
+ User* user = dynamic_cast<User*>(ServerInstance->FindDescriptor(fd));
if (user == NULL)
return -1;
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';
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;
- 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;
-}
projects / user / henk / code / inspircd.git / blobdiff