]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_check.cpp
Remove InspIRCd* parameters and fields
[user/henk/code/inspircd.git] / src / modules / m_check.cpp
index 117ff72d07e71bb0b8350eb7cd5b2942c02db8d3..e3de633254728e10f3a43a75b5ae8913e77e786a 100644 (file)
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
 class CommandCheck : public Command
 {
  public:
-       CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1)
+       CommandCheck(Module* parent) : Command(parent,"CHECK", 1)
        {
-               this->source = "m_check.so";
-               syntax = "<nickname>|<ip>|<hostmask>|<channel>";
+               flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       std::string timestring(time_t time)
        {
+               char timebuf[60];
+               struct tm *mytime = gmtime(&time);
+               strftime(timebuf, 59, "%Y-%m-%d %H:%M:%S UTC (%s)", mytime);
+               return std::string(timebuf);
+       }
+
+       void dumpExt(User* user, std::string checkstr, Extensible* ext)
+       {
+               std::stringstream dumpkeys;
+               for(ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
+               {
+                       ExtensionItem* item = Extensible::GetItem(i->first);
+                       std::string value;
+                       if (item)
+                               value = item->serialize(FORMAT_USER, ext, i->second);
+                       if (value.empty())
+                               dumpkeys << " " << i->first;
+                       else
+                               ServerInstance->DumpText(user, checkstr + " meta:" + i->first + " " + value);
+               }
+               if (!dumpkeys.str().empty())
+                       ServerInstance->DumpText(user,checkstr + " metadata", dumpkeys);
+       }
+
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       {
+               if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
+                       return CMD_SUCCESS;
+
                User *targuser;
                Channel *targchan;
                std::string checkstr;
                std::string chliststr;
 
-               char timebuf[60];
-               struct tm *mytime;
-
-
-               checkstr = "304 " + std::string(user->nick) + " :CHECK";
+               checkstr = std::string(":") + ServerInstance->Config->ServerName + " 304 " + std::string(user->nick) + " :CHECK";
 
                targuser = ServerInstance->FindNick(parameters[0]);
                targchan = ServerInstance->FindChan(parameters[0]);
@@ -50,78 +73,92 @@ class CommandCheck : public Command
                 *  :server.name 304 target :CHECK END
                 */
 
-               user->WriteServ(checkstr + " START " + parameters[0]);
+               ServerInstance->DumpText(user, checkstr + " START " + parameters[0]);
 
                if (targuser)
                {
                        /* /check on a user */
-                       user->WriteServ(checkstr + " nuh " + targuser->GetFullHost());
-                       user->WriteServ(checkstr + " realnuh " + targuser->GetFullRealHost());
-                       user->WriteServ(checkstr + " realname " + targuser->fullname);
-                       user->WriteServ(checkstr + " modes +" + targuser->FormatModes());
-                       user->WriteServ(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
-                       user->WriteServ(checkstr + " server " + targuser->server);
+                       ServerInstance->DumpText(user, checkstr + " nuh " + targuser->GetFullHost());
+                       ServerInstance->DumpText(user, checkstr + " realnuh " + targuser->GetFullRealHost());
+                       ServerInstance->DumpText(user, checkstr + " realname " + targuser->fullname);
+                       ServerInstance->DumpText(user, checkstr + " modes +" + targuser->FormatModes());
+                       ServerInstance->DumpText(user, checkstr + " snomasks +" + targuser->FormatNoticeMasks());
+                       ServerInstance->DumpText(user, checkstr + " server " + targuser->server);
+                       ServerInstance->DumpText(user, checkstr + " uid " + targuser->uuid);
+                       ServerInstance->DumpText(user, checkstr + " signon " + timestring(targuser->signon));
+                       ServerInstance->DumpText(user, checkstr + " nickts " + timestring(targuser->age));
+                       if (IS_LOCAL(targuser))
+                               ServerInstance->DumpText(user, checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
 
                        if (IS_AWAY(targuser))
                        {
                                /* user is away */
-                               user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg);
+                               ServerInstance->DumpText(user, checkstr + " awaytime " + timestring(targuser->awaytime));
+                               ServerInstance->DumpText(user, checkstr + " awaymsg " + targuser->awaymsg);
                        }
 
                        if (IS_OPER(targuser))
                        {
                                /* user is an oper of type ____ */
-                               user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper));
+                               ServerInstance->DumpText(user, checkstr + " opertype " + irc::Spacify(targuser->oper.c_str()));
                        }
 
                        if (IS_LOCAL(targuser))
                        {
-                               /* port information is only held for a local user! */
-                               user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort()));
+                               ServerInstance->DumpText(user, checkstr + " clientaddr " + irc::sockets::satouser(&targuser->client_sa));
+                               ServerInstance->DumpText(user, checkstr + " serveraddr " + irc::sockets::satouser(&targuser->server_sa));
+
+                               std::string classname = targuser->GetClass()->name;
+                               if (!classname.empty())
+                                       ServerInstance->DumpText(user, checkstr + " connectclass " + classname);
+                       }
+                       else
+                               ServerInstance->DumpText(user, checkstr + " onip " + targuser->GetIPString());
+
+                       for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
+                       {
+                               Channel* c = *i;
+                               chliststr.append(c->GetPrefixChar(targuser)).append(c->name).append(" ");
                        }
 
-                       chliststr = targuser->ChannelList(targuser);
                        std::stringstream dump(chliststr);
 
-                       ServerInstance->DumpText(user,checkstr + " onchans ", dump);
+                       ServerInstance->DumpText(user,checkstr + " onchans", dump);
+
+                       dumpExt(user, checkstr, targuser);
                }
                else if (targchan)
                {
                        /* /check on a channel */
-                       time_t creation_time = targchan->created;
-                       time_t topic_time = targchan->topicset;
-
-                       mytime = gmtime(&creation_time);
-                       strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
-                       user->WriteServ(checkstr + " created " + timebuf);
+                       ServerInstance->DumpText(user, checkstr + " timestamp " + timestring(targchan->age));
 
                        if (targchan->topic[0] != 0)
                        {
                                /* there is a topic, assume topic related information exists */
-                               user->WriteServ(checkstr + " topic " + targchan->topic);
-                               user->WriteServ(checkstr + " topic_setby " + targchan->setby);
-                               mytime = gmtime(&topic_time);
-                               strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
-                               user->WriteServ(checkstr + " topic_setat " + timebuf);
+                               ServerInstance->DumpText(user, checkstr + " topic " + targchan->topic);
+                               ServerInstance->DumpText(user, checkstr + " topic_setby " + targchan->setby);
+                               ServerInstance->DumpText(user, checkstr + " topic_setat " + timestring(targchan->topicset));
                        }
 
-                       user->WriteServ(checkstr + " modes " + targchan->ChanModes(true));
-                       user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
-                       
+                       ServerInstance->DumpText(user, checkstr + " modes " + targchan->ChanModes(true));
+                       ServerInstance->DumpText(user, checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
+
                        /* now the ugly bit, spool current members of a channel. :| */
 
-                       CUList *ulist= targchan->GetUsers();
+                       const UserMembList *ulist= targchan->GetUsers();
 
                        /* note that unlike /names, we do NOT check +i vs in the channel */
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+                       for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                        {
                                char tmpbuf[MAXBUF];
                                /*
                                 * Unlike Asuka, I define a clone as coming from the same host. --w00t
                                 */
-                               snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", i->first->GlobalCloneCount(), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname);
-                               user->WriteServ(checkstr + " member " + tmpbuf);
+                               snprintf(tmpbuf, MAXBUF, "%-3lu %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
+                               ServerInstance->DumpText(user, checkstr + " member " + tmpbuf);
                        }
+
+                       dumpExt(user, checkstr, targchan);
                }
                else
                {
@@ -129,27 +166,34 @@ class CommandCheck : public Command
                        long x = 0;
 
                        /* hostname or other */
-                       for (user_hash::const_iterator a = ServerInstance->clientlist->begin(); a != ServerInstance->clientlist->end(); a++)
+                       for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
                        {
-                               if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
+                               if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
                                {
                                        /* host or vhost matches mask */
-                                       user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+                                       ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
                                }
                                /* IP address */
-                               else if (match(a->second->GetIPString(), parameters[0], true))
+                               else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
                                {
                                        /* same IP. */
-                                       user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+                                       ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
                                }
                        }
 
-                       user->WriteServ(checkstr + " matches " + ConvToStr(x));
+                       ServerInstance->DumpText(user, checkstr + " matches " + ConvToStr(x));
                }
 
-               user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+               ServerInstance->DumpText(user, checkstr + " END " + parameters[0]);
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
+       }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               if (parameters.size() > 1)
+                       return ROUTE_OPT_UCAST(parameters[1]);
+               return ROUTE_LOCALONLY;
        }
 };
 
@@ -157,26 +201,21 @@ class CommandCheck : public Command
 class ModuleCheck : public Module
 {
  private:
-       CommandCheck *mycommand;
+       CommandCheck mycommand;
  public:
-       ModuleCheck(InspIRCd* Me) : Module(Me)
+       ModuleCheck() : mycommand(this)
        {
-               
-               mycommand = new CommandCheck(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&mycommand);
        }
-       
-       virtual ~ModuleCheck()
+
+       ~ModuleCheck()
        {
        }
-       
-       virtual Version GetVersion()
+
+       Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON);
        }
-
-       
 };
 
 MODULE_INIT(ModuleCheck)