X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=7fe9bc8d57d08bf66ed197da2bb6f09d2b52d156;hb=97c0e6b4c4e304a1c4e764fc06a7e2663a41743d;hp=3ab31ebbc54dac997ca2859a05379d5da8f45dd4;hpb=558ceaf16b422c1cd47aec99a80889ec7f6c4a12;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 3ab31ebbc..7fe9bc8d5 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -2,47 +2,34 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * 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. * * --------------------------------------------------- */ -using namespace std; - -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "message.h" -#include "commands.h" #include "inspircd.h" -#include "helperfuncs.h" /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */ -extern user_hash clientlist; -extern bool match(const char *, const char *); - -static Server *Srv; - -class cmd_check : public command_t +/** Handle /CHECK + */ +class CommandCheck : public Command { public: - cmd_check() : command_t("CHECK", 'o', 1) + CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", "o", 1) { this->source = "m_check.so"; + syntax = "|||"; } - void Handle (char **parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - userrec *targuser; - chanrec *targchan; + User *targuser; + Channel *targchan; std::string checkstr; std::string chliststr; @@ -52,8 +39,8 @@ class cmd_check : public command_t checkstr = "304 " + std::string(user->nick) + " :CHECK"; - targuser = Srv->FindNick(std::string(parameters[0])); - targchan = Srv->FindChannel(std::string(parameters[0])); + targuser = ServerInstance->FindNick(parameters[0]); + targchan = ServerInstance->FindChan(parameters[0]); /* * Syntax of a /check reply: @@ -62,60 +49,73 @@ class cmd_check : public command_t * :server.name 304 target :CHECK END */ - Srv->SendTo(NULL, user, checkstr + " START " + parameters[0]); + user->WriteServ(checkstr + " START " + parameters[0]); if (targuser) { /* /check on a user */ - Srv->SendTo(NULL, user, checkstr + " nuh " + targuser->GetFullHost()); - Srv->SendTo(NULL, user, checkstr + " realnuh " + targuser->GetFullRealHost()); - Srv->SendTo(NULL, user, checkstr + " realname " + targuser->fullname); - Srv->SendTo(NULL, user, checkstr + " modes +" + targuser->modes); - Srv->SendTo(NULL, user, checkstr + " server " + targuser->server); - if (targuser->awaymsg[0] != 0) + 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); + user->WriteServ(checkstr + " uid " + targuser->uuid); + user->WriteServ(checkstr + " signon " + ConvToStr(targuser->signon)); + user->WriteServ(checkstr + " nickts " + ConvToStr(targuser->age)); + if (IS_LOCAL(targuser)) + user->WriteServ(checkstr + " lastmsg " + ConvToStr(targuser->idle_lastmsg)); + + if (IS_AWAY(targuser)) { /* user is away */ - Srv->SendTo(NULL, user, checkstr + " awaymsg " + targuser->awaymsg); + user->WriteServ(checkstr + " awaytime " + ConvToStr(targuser->awaytime)); + user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg); } - if (targuser->oper[0] != 0) + + if (IS_OPER(targuser)) { /* user is an oper of type ____ */ - Srv->SendTo(NULL, user, checkstr + " opertype " + 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! */ - Srv->SendTo(NULL, user, checkstr + " onport " + ConvToStr(targuser->port)); + user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort())); + std::string classname = targuser->GetClass()->GetName(); + if (!classname.empty()) + user->WriteServ(checkstr + " connectclass " + classname); } - chliststr = chlist(targuser, targuser); + chliststr = targuser->ChannelList(targuser); std::stringstream dump(chliststr); - Srv->DumpText(user,checkstr + " onchans ", dump); + ServerInstance->DumpText(user,checkstr + " onchans ", dump); } else if (targchan) { /* /check on a channel */ - time_t creation_time = targchan->created; + time_t creation_time = targchan->age; time_t topic_time = targchan->topicset; mytime = gmtime(&creation_time); strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime); - Srv->SendTo(NULL, user, checkstr + " created " + timebuf); + user->WriteServ(checkstr + " timestamp " + timebuf); if (targchan->topic[0] != 0) { /* there is a topic, assume topic related information exists */ - Srv->SendTo(NULL, user, checkstr + " topic " + targchan->topic); - Srv->SendTo(NULL, user, checkstr + " topic_setby " + targchan->setby); + 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); - Srv->SendTo(NULL, user, checkstr + " topic_setat " + timebuf); + user->WriteServ(checkstr + " topic_setat " + timebuf); } - Srv->SendTo(NULL, user, checkstr + " modes " + chanmodes(targchan, true)); - Srv->SendTo(NULL, user, checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); - + 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(); @@ -123,72 +123,41 @@ class cmd_check : public command_t /* note that unlike /names, we do NOT check +i vs in the channel */ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char list[MAXBUF]; char tmpbuf[MAXBUF]; - char* ptr = list; - int flags = cflags(i->second, targchan); /* - * find how many connections from this user's IP -- unlike Asuka, - * I define a clone as coming from the same host. --w00t + * Unlike Asuka, I define a clone as coming from the same host. --w00t */ - sprintf(ptr, "%lu ", FindMatchingGlobal(i->second)); - - if (flags & UCMODE_OP) - { - strcat(ptr, "@"); - } - - if (flags & UCMODE_HOP) - { - strcat(ptr, "%"); - } - - if (flags & UCMODE_VOICE) - { - strcat(ptr, "+"); - } - - sprintf(tmpbuf, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname); - strcat(ptr, tmpbuf); - - Srv->SendTo(NULL, user, checkstr + " member " + ptr); + 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); } } else { /* /check on an IP address, or something that doesn't exist */ - struct sockaddr_in addr; long x = 0; - if (inet_aton(parameters[0], &addr.sin_addr) == 0) + /* hostname or other */ + for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++) { - /* hostname or other */ - for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++) + if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map)) { - if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0])) - { - /* host or vhost matches mask */ - Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); - } + /* host or vhost matches mask */ + user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } - } - else - { /* IP address */ - for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++) + else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0])) { - if (addr.sin_addr.s_addr == a->second->ip4.s_addr) - { - /* same IP. */ - Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); - } + /* same IP. */ + user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } } - Srv->SendTo(NULL, user, checkstr + " matches " + ConvToStr(x)); + user->WriteServ(checkstr + " matches " + ConvToStr(x)); } - Srv->SendTo(NULL, user, checkstr + " END " + std::string(parameters[0])); + user->WriteServ(checkstr + " END " + parameters[0]); + + return CMD_LOCALONLY; } }; @@ -196,53 +165,26 @@ class cmd_check : public command_t class ModuleCheck : public Module { private: - cmd_check *mycommand; + CommandCheck *mycommand; public: - ModuleCheck(Server* Me) : Module::Module(Me) + ModuleCheck(InspIRCd* Me) : Module(Me) { - Srv = Me; - mycommand = new cmd_check(); - Srv->AddCommand(mycommand); + + mycommand = new CommandCheck(ServerInstance); + ServerInstance->AddCommand(mycommand); + } - + virtual ~ModuleCheck() { } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 0, VF_VENDOR); - } - void Implements(char* List) + virtual Version GetVersion() { - /* we don't hook anything, nothing required */ + return Version("$Id$", VF_VENDOR, API_VERSION); } - -}; - -class ModuleCheckFactory : public ModuleFactory -{ - public: - ModuleCheckFactory() - { - } - - ~ModuleCheckFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleCheck(Me); - } - }; -extern "C" void * init_module( void ) -{ - return new ModuleCheckFactory; -} - +MODULE_INIT(ModuleCheck)