summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/configreader.h24
-rw-r--r--src/configreader.cpp31
-rw-r--r--src/modules/m_xmlsocket.cpp55
3 files changed, 34 insertions, 76 deletions
diff --git a/include/configreader.h b/include/configreader.h
index b94687b43..f47c6680e 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -546,10 +546,8 @@ class CoreExport ServerConfig : public Extensible
*/
std::vector<ListenSocket*> ports;
- /** A list of ports claimed by IO Modules
+ /** socket objects that are attached to by modules
*/
- std::map<int,Module*> IOHookModule;
-
std::map<BufferedSocket*, Module*> SocketIOHookModule;
/** The 005 tokens of this server (ISUPPORT)
@@ -759,27 +757,7 @@ class CoreExport ServerConfig : public Extensible
void ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild);
void ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val);
-
- /** Get a pointer to the module which has hooked the given port.
- * @parameter port Port number
- * @return Returns a pointer to the hooking module, or NULL
- */
- Module* GetIOHook(int port);
- /** Hook a module to a client port, so that it can receive notifications
- * of low-level port activity.
- * @param port The port number
- * @param Module the module to hook to the port
- * @return True if the hook was successful.
- */
- bool AddIOHook(int port, Module* iomod);
-
- /** Delete a module hook from a client port.
- * @param port The port to detatch from
- * @return True if successful
- */
- bool DelIOHook(int port);
-
/** Get a pointer to the module which has hooked the given BufferedSocket class.
* @parameter port Port number
* @return Returns a pointer to the hooking module, or NULL
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 83b7e14d9..cba015ec9 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -63,32 +63,12 @@ void ServerConfig::ClearStack()
include_stack.clear();
}
-Module* ServerConfig::GetIOHook(int port)
-{
- std::map<int,Module*>::iterator x = IOHookModule.find(port);
- return (x != IOHookModule.end() ? x->second : NULL);
-}
-
Module* ServerConfig::GetIOHook(BufferedSocket* is)
{
std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
return (x != SocketIOHookModule.end() ? x->second : NULL);
}
-bool ServerConfig::AddIOHook(int port, Module* iomod)
-{
- if (!GetIOHook(port))
- {
- IOHookModule[port] = iomod;
- return true;
- }
- else
- {
- throw ModuleException("Port already hooked by another module");
- return false;
- }
-}
-
bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
{
if (!GetIOHook(is))
@@ -104,17 +84,6 @@ bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
}
}
-bool ServerConfig::DelIOHook(int port)
-{
- std::map<int,Module*>::iterator x = IOHookModule.find(port);
- if (x != IOHookModule.end())
- {
- IOHookModule.erase(x);
- return true;
- }
- return false;
-}
-
bool ServerConfig::DelIOHook(BufferedSocket* is)
{
std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
diff --git a/src/modules/m_xmlsocket.cpp b/src/modules/m_xmlsocket.cpp
index cfe22bca9..2e4b17fc6 100644
--- a/src/modules/m_xmlsocket.cpp
+++ b/src/modules/m_xmlsocket.cpp
@@ -18,7 +18,7 @@
class ModuleXMLSocket : public Module
{
ConfigReader* Conf;
- std::vector<int> listenports;
+ std::vector<std::string> listenports;
public:
@@ -26,8 +26,13 @@ class ModuleXMLSocket : public Module
: Module(Me)
{
OnRehash(NULL,"");
- Implementation eventlist[] = { I_OnUnloadModule, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 4);
+ Implementation eventlist[] = { I_OnUnloadModule, I_OnRawSocketRead, I_OnRawSocketWrite, I_OnRehash, I_OnHookUserIO, I_OnCleanup };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
+ }
+
+ bool isin(const std::string &hostandport, const std::vector<std::string> &portlist)
+ {
+ return std::find(portlist.begin(), portlist.end(), hostandport) != portlist.end();
}
virtual void OnRehash(User* user, const std::string &param)
@@ -35,11 +40,6 @@ class ModuleXMLSocket : public Module
Conf = new ConfigReader(ServerInstance);
- for (unsigned int i = 0; i < listenports.size(); i++)
- {
- ServerInstance->Config->DelIOHook(listenports[i]);
- }
-
listenports.clear();
for (int i = 0; i < Conf->Enumerate("bind"); i++)
@@ -50,27 +50,21 @@ class ModuleXMLSocket : public Module
{
// 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()))
{
try
{
- if (ServerInstance->Config->AddIOHook(portno, this))
- {
- listenports.push_back(portno);
- for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++)
- if (ServerInstance->Config->ports[j]->GetPort() == portno)
- ServerInstance->Config->ports[j]->SetDescription("xml");
- }
- else
- {
- ServerInstance->Logs->Log("m_xmlsocket",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[i]->GetPort() == portno) && (ServerInstance->Config->ports[i]->GetIP() == addr))
+ ServerInstance->Config->ports[j]->SetDescription("xml");
}
catch (ModuleException &e)
{
- ServerInstance->Logs->Log("m_xmlsocket",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 %d: %s. Maybe you have another similar module loaded?", portno, e.GetReason());
}
}
}
@@ -89,19 +83,36 @@ class ModuleXMLSocket : public Module
{
for(unsigned int i = 0; i < listenports.size(); i++)
{
- ServerInstance->Config->DelIOHook(listenports[i]);
for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++)
- if (ServerInstance->Config->ports[j]->GetPort() == listenports[i])
+ 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, 2, 0, 0, VF_VENDOR, API_VERSION);
}
+ virtual void OnHookUserIO(User* user, const std::string &targetip)
+ {
+ if (!user->io && isin(targetip+":"+ConvToStr(user->GetPort()),listenports))
+ {
+ /* Hook the user with our module */
+ user->io = this;
+ }
+ }
virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 19:45:17 +0000