X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xmlsocket.cpp;h=face79635ae2d99b80b51724b62d77675c9b146e;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;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..face79635 100644
--- a/src/modules/m_xmlsocket.cpp
+++ b/src/modules/m_xmlsocket.cpp
@@ -11,39 +11,23 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include "inspircd_config.h"
-#include "configreader.h"
+#include "inspircd.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,"");
 	}
@@ -59,12 +43,11 @@ class ModuleXMLSocket : public Module
 		}
 
 		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"))
+			if (((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "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 +55,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
 						{
@@ -109,10 +91,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");
 			}
 		}
 	}
@@ -141,6 +122,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';
@@ -156,14 +143,22 @@ class ModuleXMLSocket : public Module
 		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;
 	}
@@ -188,7 +183,7 @@ class ModuleXMLSocketFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleXMLSocketFactory;
 }