* | 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 <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
/* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */
public:
std::string action;
std::string newhost;
+ std::string ports;
};
typedef std::map<std::string,Host*> hostchanges_t;
class ModuleHostChange : public Module
{
private:
-
-
- ConfigReader *Conf;
hostchanges_t hostchanges;
std::string MySuffix;
-
+ std::string MyPrefix;
+ std::string MySeparator;
+
public:
ModuleHostChange(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
- Conf = new ConfigReader(ServerInstance);
OnRehash(NULL,"");
+ Implementation eventlist[] = { I_OnRehash, I_OnUserConnect };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
-
+
virtual ~ModuleHostChange()
{
- DELETE(Conf);
+ for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
+ {
+ delete i->second;
+ }
+ hostchanges.clear();
}
- Priority Prioritize()
+ void Prioritize()
{
- return (Priority)ServerInstance->PriorityAfter("m_cloaking.so");
+ Module* cloak = ServerInstance->Modules->Find("m_cloaking.so");
+ ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &cloak);
}
- void Implements(char* List)
- {
- List[I_OnRehash] = List[I_OnUserConnect] = 1;
- }
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
- DELETE(Conf);
- Conf = new ConfigReader(ServerInstance);
- MySuffix = Conf->ReadValue("host","suffix",0);
+ ConfigReader Conf(ServerInstance);
+ MySuffix = Conf.ReadValue("host","suffix",0);
+ MyPrefix = Conf.ReadValue("host","prefix","",0);
+ MySeparator = Conf.ReadValue("host","separator",".",0);
for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
{
- DELETE(i->second);
+ delete i->second;
}
hostchanges.clear();
- for (int index = 0; index < Conf->Enumerate("hostchange"); index++)
+ for (int index = 0; index < Conf.Enumerate("hostchange"); index++)
{
- std::string mask = Conf->ReadValue("hostchange","mask",index);
- std::string action = Conf->ReadValue("hostchange","action",index);
- std::string newhost = Conf->ReadValue("hostchange","value",index);
+ std::string mask = Conf.ReadValue("hostchange", "mask", index);
+ std::string ports = Conf.ReadValue("hosthange", "ports", index);
+ std::string action = Conf.ReadValue("hostchange", "action", index);
+ std::string newhost = Conf.ReadValue("hostchange", "value", index);
Host* x = new Host;
x->action = action;
+ x->ports = ports;
x->newhost = newhost;
hostchanges[mask] = x;
}
}
-
+
virtual Version GetVersion()
{
// returns the version number of the module to be
// listed in /MODULES
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("$Id$", VF_VENDOR, API_VERSION);
}
-
- virtual void OnUserConnect(userrec* user)
+
+ virtual void OnUserConnect(User* user)
{
for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
{
- if (ServerInstance->MatchText(std::string(user->ident)+"@"+std::string(user->host),i->first))
+ if (((InspIRCd::MatchCIDR(user->MakeHost(), i->first)) || (InspIRCd::MatchCIDR(user->MakeHostIP(), i->first))))
{
- Host* h = (Host*)i->second;
+ Host* h = i->second;
+
+ if (!h->ports.empty())
+ {
+ irc::portparser portrange(h->ports, false);
+ long portno = -1;
+ bool foundany = false;
+
+ while ((portno = portrange.GetToken()))
+ if (portno == user->GetPort())
+ foundany = true;
+
+ if (!foundany)
+ continue;
+ }
+
// host of new user matches a hostchange tag's mask
- std::string newhost = "";
+ std::string newhost;
if (h->action == "set")
{
newhost = h->newhost;
else if (h->action == "addnick")
{
// first take their nick and strip out non-dns, leaving just [A-Z0-9\-]
- std::string complete = "";
+ std::string complete;
std::string old = user->nick;
for (unsigned int j = 0; j < old.length(); j++)
{
complete = complete + old[j];
}
}
- if (complete == "")
+ if (complete.empty())
complete = "i-have-a-lame-nick";
- newhost = complete + "." + MySuffix;
+
+ if (!MyPrefix.empty())
+ newhost = MyPrefix + MySeparator + complete;
+ else
+ newhost = complete + MySeparator + MySuffix;
}
- if (newhost != "")
+ if (!newhost.empty())
{
user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your virtual host: " + newhost);
if (!user->ChangeDisplayedHost(newhost.c_str()))
}
};
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleHostChangeFactory : public ModuleFactory
-{
- public:
- ModuleHostChangeFactory()
- {
- }
-
- ~ModuleHostChangeFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleHostChange(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleHostChangeFactory;
-}
-
+MODULE_INIT(ModuleHostChange)