Try this as the ssl crash fix

[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 9e5b33d4e3befb498ed03de5b21b4bfc9f13c566..7ffeb383a1fbe4b7ab7adc5d7600e83bb1a8ef20 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,97 +2,88 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
-Server *Srv;
-        
-void handle_userip(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,strchr(u->modes,'o') ? "*" : "",u->ident,u->ip);
-                        strlcat(Return,junk,MAXBUF);
-                }
-        }
-        WriteServ(user->fd,Return);
-}
-
-
-class ModuleUserIP : public Module
+/** Handle /USERIP
+ */
+class CommandUserip : public Command
 {
  public:
-       ModuleUserIP(Server* Me)
-               : Module::Module(Me)
+       CommandUserip (InspIRCd* Instance) : Command(Instance,"USERIP", "o", 1)
        {
-               Srv = Me;
-               Srv->AddCommand("USERIP",handle_userip,'o',1,"m_userip.so");
+               this->source = "m_userip.so";
+               syntax = "<nick>{,<nick>}";
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-               output = output + std::string(" USERIP");
-        }
-       
-       virtual ~ModuleUserIP()
-       {
-       }
-       
-       virtual Version GetVersion()
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               std::string retbuf = std::string("340 ") + user->nick + " :";
+               int nicks = 0;
+
+               for (int i = 0; i < (int)parameters.size(); i++)
+               {
+                       User *u = ServerInstance->FindNick(parameters[i]);
+                       if ((u) && (u->registered == REG_ALL))
+                       {
+                               retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
+                               if (IS_AWAY(u))
+                                       retbuf += "-";
+                               else
+                                       retbuf += "+";
+                               retbuf += u->ident + "@" + u->GetIPString() + " ";
+                               nicks++;
+                       }
+               }
+
+               if (nicks != 0)
+                       user->WriteServ(retbuf);
+
+               /* Dont send to the network */
+               return CMD_LOCALONLY;
        }
-       
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleUserIPFactory : public ModuleFactory
+class ModuleUserIP : public Module
 {
+       CommandUserip* mycommand;
  public:
-       ModuleUserIPFactory()
+       ModuleUserIP(InspIRCd* Me)
+               : Module(Me)
        {
+
+               mycommand = new CommandUserip(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
-       
-       ~ModuleUserIPFactory()
+
+
+       virtual void On005Numeric(std::string &output)
        {
+               output = output + std::string(" USERIP");
        }
-       
-       virtual Module * CreateModule(Server* Me)
+
+       virtual ~ModuleUserIP()
        {
-               return new ModuleUserIP(Me);
        }
-       
-};
 
+       virtual Version GetVersion()
+       {
+               return Version("$Id$",VF_VENDOR,API_VERSION);
+       }
 
-extern "C" void * init_module( void )
-{
-       return new ModuleUserIPFactory;
-}
+};
+
+MODULE_INIT(ModuleUserIP)