ServerInstance->Modules->Attach(eventlist, this, 6);
}
- bool isin(const std::string &hostandport, const std::vector<std::string> &portlist)
+ bool isin(const std::string &host, int port, const std::vector<std::string> &portlist)
{
- return std::find(portlist.begin(), portlist.end(), hostandport) != portlist.end();
+ if (std::find(portlist.begin(), portlist.end(), "*:" + ConvToStr(port)) != portlist.end())
+ return true;
+
+ if (std::find(portlist.begin(), portlist.end(), ":" + ConvToStr(port)) != portlist.end())
+ return true;
+
+ return std::find(portlist.begin(), portlist.end(), host + ":" + ConvToStr(port)) != portlist.end();
}
virtual void OnRehash(User* user, const std::string ¶m)
// 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()))
{
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))
+ if ((ServerInstance->Config->ports[j]->GetPort() == portno) && (ServerInstance->Config->ports[j]->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 you have another similar module loaded?", portno, e.GetReason());
+ ServerInstance->Logs->Log("m_xmlsocket",DEFAULT, "m_xmlsocket.so: FAILED to enable XMLSocket on port %ld: %s. Maybe you have another similar module loaded?", portno, e.GetReason());
}
}
}
}
}
- virtual void OnCleanup(int target_type, void* item)
+ virtual void OnCleanup(int target_type, void* item)
{
if(target_type == TYPE_USER)
{
User* user = (User*)item;
- if(user->io == this)
- user->io = NULL;
+ if(user->GetIOHook() == this)
+ user->DelIOHook();
}
}
virtual Version GetVersion()
{
- return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_VENDOR, API_VERSION);
}
virtual void OnHookUserIO(User* user, const std::string &targetip)
{
- if (!user->io && isin(targetip+":"+ConvToStr(user->GetPort()),listenports))
+ if (!user->GetIOHook() && isin(targetip,user->GetPort(),listenports))
{
/* Hook the user with our module */
- user->io = this;
+ user->AddIOHook(this);
}
}