Remove unneeded headers from spanningtree. This was done to the rest of the source...

[user/henk/code/inspircd.git] / src / modules / m_hostchange.cpp

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index d2e51a187748ae1beae92465d08bd8343a1110eb..cf85a3900f3037969c61ac147ba570de1599ac79 100644 (file)
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -11,11 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
+#include "wildcard.h"
 
 /* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */
 
@@ -26,6 +23,7 @@ class Host : public classbase
  public:
        std::string action;
        std::string newhost;
+       std::string ports;
 };
 
 typedef std::map<std::string,Host*> hostchanges_t;
@@ -33,23 +31,25 @@ 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(Me)
        {
-               Conf = new ConfigReader(ServerInstance);
                OnRehash(NULL,"");
        }
        
        virtual ~ModuleHostChange()
        {
-               DELETE(Conf);
+               for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
+               {
+                       DELETE(i->second);
+               }
+               hostchanges.clear();
        }
 
        Priority Prioritize()
@@ -64,21 +64,24 @@ class ModuleHostChange : public Module
 
        virtual void OnRehash(userrec* user, const std::string &parameter)
        {
-               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);
                }
                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;
                }
@@ -95,11 +98,26 @@ class ModuleHostChange : public Module
        {
                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 (((match(user->MakeHost(),i->first.c_str(),true)) || (match(user->MakeHostIP(),i->first.c_str()))))
                        {
-                               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;
@@ -111,7 +129,7 @@ class ModuleHostChange : public Module
                                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++)
                                        {
@@ -123,11 +141,15 @@ class ModuleHostChange : public Module
                                                        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()))
@@ -139,29 +161,4 @@ class ModuleHostChange : public Module
        }
 };
 
-// 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" DllExport void * init_module( void )
-{
-       return new ModuleHostChangeFactory;
-}
-
+MODULE_INIT(ModuleHostChange)