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

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index a866d938d2d9663782c389a35cd732c5cdd8b743..49a6fdabb454a1229083354dd2b2024278b6f820 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -12,9 +12,7 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
-#include "dns.h"
+
 #ifndef WINDOWS
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -23,7 +21,7 @@
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
-enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
+enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
 
 
 /** Holds a CGI site's details
@@ -91,8 +89,11 @@ class CGIResolver : public Resolver
        CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached)
                : Resolver(ServerInstance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
-       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
        {
+               if (resultnum)
+                       return;
+
                /* Check the user still exists */
                if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
                {
@@ -162,21 +163,28 @@ public:
                        
                        if(hostmask.length())
                        {
-                               Hosts.push_back(CGIhost(hostmask));
-                               
-                               if(type == "pass")
-                                       Hosts.back().type = PASS;
-                               else if(type == "ident")
-                                       Hosts.back().type = IDENT;
-                               else if(type == "passfirst")
-                                       Hosts.back().type = PASSFIRST;
-                               else if(type == "webirc") {
-                                       Hosts.back().type = WEBIRC;
-                                       if(password.length())
-                                               Hosts.back().password=password;
-                                       else
+                               if (type == "webirc" && !password.length()) {
                                                ServerInstance->Log(DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
                                }
+                               else
+                               {
+                                       CGItype cgitype = INVALID;
+                                       if (type == "pass")
+                                               cgitype = PASS;
+                                       else if (type == "ident")
+                                               cgitype = IDENT;
+                                       else if (type == "passfirst")
+                                               cgitype = PASSFIRST;
+                                       else if (type == "webirc")
+                                       {
+                                               cgitype = WEBIRC;
+                                       }
+
+                                       if (cgitype == INVALID)
+                                               cgitype = PASS;
+
+                                       Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));
+                               }
                        }
                        else
                        {
@@ -289,6 +297,7 @@ public:
                if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
                {
                        bool valid=false;
+                       user->RemoveCloneCounts();
 #ifdef IPV6
                        valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0); 
 
@@ -302,6 +311,9 @@ public:
                        delete webirc_ip;
                        user->InvalidateCache();
                        user->Shrink("cgiirc_webirc_ip");
+                       ServerInstance->AddLocalClone(user);
+                       ServerInstance->AddGlobalClone(user);
+                       user->CheckClass();
                }
        }
 
@@ -316,6 +328,7 @@ public:
                        user->InvalidateCache();
 
                        bool valid = false;
+                       user->RemoveCloneCounts();
 #ifdef IPV6
                        if (user->GetProtocolFamily() == AF_INET6)
                                valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
@@ -325,6 +338,10 @@ public:
                        if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr))
                                valid = true;
 #endif
+                       ServerInstance->AddLocalClone(user);
+                       ServerInstance->AddGlobalClone(user);
+                       user->CheckClass();
+
                        if (valid)
                        {
                                /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */
@@ -381,15 +398,16 @@ public:
                        
                user->Extend("cgiirc_realhost", new std::string(user->host));
                user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
+               user->RemoveCloneCounts();
 #ifdef IPV6
                if (user->GetProtocolFamily() == AF_INET6)
                        inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr);
                else
-                       inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
-#else
-               inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
 #endif
-                                       
+               inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
+               ServerInstance->AddLocalClone(user);
+               ServerInstance->AddGlobalClone(user);
+               user->CheckClass();
                try
                {
                        strlcpy(user->host, newip, 16);
@@ -498,26 +516,4 @@ public:
        
 };
 
-class ModuleCgiIRCFactory : public ModuleFactory
-{
- public:
-       ModuleCgiIRCFactory()
-       {
-       }
-       
-       ~ModuleCgiIRCFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCgiIRC(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleCgiIRCFactory;
-}
+MODULE_INIT(ModuleCgiIRC)