Convert more modules

[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 7f39ec1f88b027a7053758a5fb0f00de4216fe55..3ab2f50be9b8d0b8a0dc2941f5130d7750e4c84e 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -11,21 +11,21 @@
  * ---------------------------------------------------
  */
 
-#include <vector>
-#include <string>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
 #include "dns.h"
-#include "inspircd.h"
+#ifndef WINDOWS
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
 enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
 
+
 /** Holds a CGI site's details
  */
 class CGIhost : public classbase
@@ -67,8 +67,9 @@ class cmd_webirc : public command_t
                                                user->Extend("cgiirc_realhost", new std::string(user->host));
                                                user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
                                                if (notify)
-                                                       ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], "_");
+                                                       ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], user->host);
                                                user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
+                                               user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
                                                return CMD_LOCALONLY;
                                        }
                                }
@@ -125,7 +126,7 @@ class ModuleCgiIRC : public Module
        bool NotifyOpers;
        CGIHostlist Hosts;
 public:
-       ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me)
+       ModuleCgiIRC(InspIRCd* Me) : Module(Me)
        {
                
                OnRehash(NULL,"");
@@ -207,7 +208,7 @@ public:
                }
        }
        
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
+       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
        {
                if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
                {
@@ -233,7 +234,7 @@ public:
                }
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &message)
+       virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
        {
                OnCleanup(TYPE_USER, user);
        }
@@ -276,15 +277,32 @@ public:
 
        virtual void OnUserConnect(userrec* user)
        {
-               std::string* webirc_hostname;
+               std::string *webirc_hostname, *webirc_ip;
                if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
                {
                        strlcpy(user->host,webirc_hostname->c_str(),63);
                        strlcpy(user->dhost,webirc_hostname->c_str(),63);
-                       user->InvalidateCache();
                        delete webirc_hostname;
+                       user->InvalidateCache();
                        user->Shrink("cgiirc_webirc_hostname");
                }
+               if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
+               {
+                       bool valid=false;
+#ifdef IPV6
+                       valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0); 
+
+                       if(!valid)
+                               valid = (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr));
+#else
+                       if (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr))
+                               valid = true;
+#endif
+
+                       delete webirc_ip;
+                       user->InvalidateCache();
+                       user->Shrink("cgiirc_webirc_ip");
+               }
        }
 
        bool CheckPass(userrec* user)
@@ -296,7 +314,7 @@ public:
                        strlcpy(user->host, user->password, 64);
                        strlcpy(user->dhost, user->password, 64);
                        user->InvalidateCache();
-       
+
                        bool valid = false;
 #ifdef IPV6
                        if (user->GetProtocolFamily() == AF_INET6)
@@ -318,11 +336,12 @@ public:
                                /* We got as resolved hostname in the password. */
                                try
                                {
+
                                        bool cached;
                                        CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
                                        ServerInstance->AddResolver(r, cached);
                                }
-                               catch (ModuleException& e)
+                               catch (...)
                                {
                                        if (NotifyOpers)
                                                ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
@@ -366,19 +385,20 @@ public:
                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);
+                                       
                try
                {
+                       strlcpy(user->host, newip, 16);
+                       strlcpy(user->dhost, newip, 16);
+                       strlcpy(user->ident, "~cgiirc", 8);
+
                        bool cached;
                        CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
                        ServerInstance->AddResolver(r, cached);
                }
-               catch (ModuleException& e)
+               catch (...)
                {
                        strlcpy(user->host, newip, 16);
                        strlcpy(user->dhost, newip, 16);
@@ -495,7 +515,7 @@ class ModuleCgiIRCFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleCgiIRCFactory;
 }