* ---------------------------------------------------
*/
-#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,"");
}
- 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
{
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");
}
}
}
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;
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;
/* We want to alter the buffer, so we have to make a copy */
- char tmpbuffer[count+1];
- memcpy(&tmpbuffer, &buffer, count);
+ 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
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;
-}