The IPV6 stuff compiles now, with compile-correct ipv6 code. I dont know if this...

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

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 4bc2155140dd58f76a494cd9ed3efac3e7855e0d..d7126684d0e949520f2e620e2c8e5d383cb52bf7 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -14,45 +14,69 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
-Server *Srv;
-        
-void handle_userip(char **parameters, int pcnt, userrec *user)
+static Server *Srv;
+
+class cmd_userip : public command_t
 {
-        char Return[MAXBUF],junk[MAXBUF];
-        snprintf(Return,MAXBUF,"302 %s :",user->nick);
-        for (int i = 0; i < pcnt; i++)
-        {
-                userrec *u = Find(parameters[i]);
-                if (u)
-                {
-                        snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,strchr(u->modes,'o') ? "*" : "",u->ident,u->ip);
-                        strlcat(Return,junk,MAXBUF);
-                }
-        }
-        WriteServ(user->fd,Return);
-}
+ public:
+       cmd_userip () : command_t("USERIP", 'o', 1)
+       {
+               this->source = "m_userip.so";
+               syntax = "<nick>{,<nick>}";
+       }
 
+       void Handle (const char** parameters, int pcnt, userrec *user)
+       {
+               char Return[MAXBUF],junk[MAXBUF];
+               snprintf(Return,MAXBUF,"340 %s :",user->nick);
+               for (int i = 0; i < pcnt; i++)
+               {
+                       userrec *u = Find(parameters[i]);
+                       if (u)
+                       {
+                               snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,(char*)insp_ntoa(u->ip4));
+                               strlcat(Return,junk,MAXBUF);
+                       }
+               }
+               WriteServ(user->fd,Return);
+       }
+};
 
 class ModuleUserIP : public Module
 {
+       cmd_userip* mycommand;
  public:
-       ModuleUserIP()
+       ModuleUserIP(Server* Me)
+               : Module::Module(Me)
+       {
+               Srv = Me;
+               mycommand = new cmd_userip();
+               Srv->AddCommand(mycommand);
+       }
+
+       void Implements(char* List)
+       {
+               List[I_On005Numeric] = 1;
+       }
+
+       virtual void On005Numeric(std::string &output)
        {
-               Srv = new Server;
-               Srv->AddCommand("USERIP",handle_UserIP,'o',1,"m_Userip.so");
+               output = output + std::string(" USERIP");
        }
        
        virtual ~ModuleUserIP()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -75,9 +99,9 @@ class ModuleUserIPFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleUserIP;
+               return new ModuleUserIP(Me);
        }
        
 };