X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_check.cpp;h=42be6a350971343e852e5ea32452ed00c43b873c;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=8c1a636525449e74cc858229acdf6c2f0941908e;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 8c1a63652..42be6a350 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 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 */ @@ -20,24 +19,30 @@ */ class CommandCheck : public Command { + Module* Parent; public: - CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1) + bool md_sent; + CommandCheck (InspIRCd* Instance, Module* parent) : Command(Instance,"CHECK", "o", 1), Parent(parent) { this->source = "m_check.so"; syntax = "|||"; } - 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); + } + + CmdResult Handle (const std::vector ¶meters, User *user) { User *targuser; Channel *targchan; std::string checkstr; std::string chliststr; - char timebuf[60]; - struct tm *mytime; - - checkstr = "304 " + std::string(user->nick) + " :CHECK"; targuser = ServerInstance->FindNick(parameters[0]); @@ -61,53 +66,57 @@ class CommandCheck : public Command user->WriteServ(checkstr + " modes +" + targuser->FormatModes()); user->WriteServ(checkstr + " snomasks +" + targuser->FormatNoticeMasks()); user->WriteServ(checkstr + " server " + targuser->server); + user->WriteServ(checkstr + " uid " + targuser->uuid); + user->WriteServ(checkstr + " signon " + timestring(targuser->signon)); + user->WriteServ(checkstr + " nickts " + timestring(targuser->age)); + if (IS_LOCAL(targuser)) + user->WriteServ(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg)); if (IS_AWAY(targuser)) { /* user is away */ + user->WriteServ(checkstr + " awaytime " + timestring(targuser->awaytime)); user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg); } if (IS_OPER(targuser)) { /* user is an oper of type ____ */ - user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper)); + user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper.c_str())); } + user->WriteServ(checkstr + " onip " + targuser->GetIPString()); if (IS_LOCAL(targuser)) { - /* port information is only held for a local user! */ - user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort())); + user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetServerPort())); + std::string classname = targuser->GetClass()->name; + if (!classname.empty()) + user->WriteServ(checkstr + " connectclass " + classname); } chliststr = targuser->ChannelList(targuser); std::stringstream dump(chliststr); ServerInstance->DumpText(user,checkstr + " onchans ", dump); + + FOREACH_MOD_I(ServerInstance,I_OnSyncUser,OnSyncUser(targuser,Parent,(void*)user)); } 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); + user->WriteServ(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); + user->WriteServ(checkstr + " topic_setat " + timestring(targchan->topicset)); } user->WriteServ(checkstr + " modes " + targchan->ChanModes(true)); user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); - + /* now the ugly bit, spool current members of a channel. :| */ CUList *ulist= targchan->GetUsers(); @@ -119,9 +128,11 @@ class CommandCheck : public Command /* * 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); + 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()); user->WriteServ(checkstr + " member " + tmpbuf); } + + FOREACH_MOD_I(ServerInstance,I_OnSyncChannel,OnSyncChannel(targchan,Parent,(void*)user)); } else { @@ -129,15 +140,15 @@ 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()); } /* 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()); @@ -147,7 +158,7 @@ class CommandCheck : public Command user->WriteServ(checkstr + " matches " + ConvToStr(x)); } - user->WriteServ(checkstr + " END " + std::string(parameters[0])); + user->WriteServ(checkstr + " END " + parameters[0]); return CMD_LOCALONLY; } @@ -157,26 +168,39 @@ class CommandCheck : public Command class ModuleCheck : public Module { private: - CommandCheck *mycommand; + CommandCheck mycommand; public: - ModuleCheck(InspIRCd* Me) : Module(Me) + ModuleCheck(InspIRCd* Me) : Module(Me), mycommand(Me, this) { - - mycommand = new CommandCheck(ServerInstance); - ServerInstance->AddCommand(mycommand); - + ServerInstance->AddCommand(&mycommand); } - + virtual ~ModuleCheck() { } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } - + virtual void ProtoSendMetaData(void* opaque, Extensible* target, const std::string& name, const std::string& value) + { + User* user = static_cast(opaque); + user->WriteServ("304 " + std::string(user->nick) + " :CHECK meta:" + name + " " + value); + mycommand.md_sent = true; + } + + virtual std::string ProtoTranslate(Extensible* item) + { + User* u = dynamic_cast(item); + Channel* c = dynamic_cast(item); + if (u) + return u->nick; + if (c) + return c->name; + return "?"; + } }; MODULE_INIT(ModuleCheck)