X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=df42d4608fd3cf690ab27e4c4bb38e03e8df03a1;hb=a8878569083bfa4753e9e118adee0ed1da6a0325;hp=4172e19a324fb2d8363d62ff3aa7145859fc9fe3;hpb=6278262baaed06e2acf134c53ed0485136d61f50;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 4172e19a3..df42d4608 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -19,13 +19,10 @@ */ class CommandCheck : public Command { - Module* Parent; public: - bool md_sent; - CommandCheck (InspIRCd* Instance, Module* parent) : Command(Instance,"CHECK", "o", 1), Parent(parent) + CommandCheck(Module* parent) : Command(parent,"CHECK", 1) { - this->source = "m_check.so"; - syntax = "|||"; + flags_needed = 'o'; syntax = "||| "; } std::string timestring(time_t time) @@ -36,14 +33,33 @@ class CommandCheck : public Command 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 = i->first; + std::string value = item->serialize(FORMAT_USER, ext, i->second); + if (!value.empty()) + ServerInstance->DumpText(user, checkstr + " meta:" + item->key + " " + value); + else if (!item->key.empty()) + dumpkeys << " " << item->key; + } + if (!dumpkeys.str().empty()) + ServerInstance->DumpText(user,checkstr + " metadata", dumpkeys); + } + CmdResult Handle (const std::vector ¶meters, User *user) { + if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName.c_str()) + return CMD_SUCCESS; + User *targuser; Channel *targchan; std::string checkstr; std::string chliststr; - 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]); @@ -55,106 +71,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); - user->WriteServ(checkstr + " uid " + targuser->uuid); - user->WriteServ(checkstr + " signon " + timestring(targuser->signon)); - user->WriteServ(checkstr + " nickts " + timestring(targuser->age)); + 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)) - user->WriteServ(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg)); + ServerInstance->DumpText(user, 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); + 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.c_str())); + ServerInstance->DumpText(user, checkstr + " opertype " + irc::Spacify(targuser->oper.c_str())); } - user->WriteServ(checkstr + " onip " + targuser->GetIPString()); if (IS_LOCAL(targuser)) { - user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetServerPort())); + 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()) - user->WriteServ(checkstr + " connectclass " + classname); + 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); - std::deque extlist; - targuser->GetExtList(extlist); - std::stringstream dumpkeys; - for(std::deque::iterator i = extlist.begin(); i != extlist.end(); i++) - { - md_sent = false; - FOREACH_MOD_I(ServerInstance,I_OnSyncUserMetaData,OnSyncUserMetaData(targuser,Parent,(void*)user,*i, true)); - if (!md_sent) - dumpkeys << " " << *i; - } - if (!dumpkeys.str().empty()) - ServerInstance->DumpText(user,checkstr + " metadata ", dumpkeys); + dumpExt(user, checkstr, targuser); } else if (targchan) { /* /check on a channel */ - user->WriteServ(checkstr + " timestamp " + timestring(targchan->age)); + 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); - user->WriteServ(checkstr + " topic_setat " + timestring(targchan->topicset)); + 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, "%-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); + ServerInstance->DumpText(user, checkstr + " member " + tmpbuf); } - std::deque extlist; - targchan->GetExtList(extlist); - std::stringstream dumpkeys; - for(std::deque::iterator i = extlist.begin(); i != extlist.end(); i++) - { - md_sent = false; - FOREACH_MOD_I(ServerInstance,I_OnSyncChannelMetaData,OnSyncChannelMetaData(targchan,Parent,(void*)user,*i, true)); - if (!md_sent) - dumpkeys << " " << *i; - } - if (!dumpkeys.str().empty()) - ServerInstance->DumpText(user,checkstr + " metadata ", dumpkeys); + dumpExt(user, checkstr, targchan); } else { @@ -167,22 +169,29 @@ class CommandCheck : public Command 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 (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 " + parameters[0]); + ServerInstance->DumpText(user, checkstr + " END " + parameters[0]); + + return CMD_SUCCESS; + } - return CMD_LOCALONLY; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + if (parameters.size() > 1) + return ROUTE_OPT_UCAST(parameters[1]); + return ROUTE_LOCALONLY; } }; @@ -190,28 +199,20 @@ class CommandCheck : public Command class ModuleCheck : public Module { private: - CommandCheck *mycommand; + CommandCheck mycommand; public: - ModuleCheck(InspIRCd* Me) : Module(Me) - { - mycommand = new CommandCheck(ServerInstance, this); - ServerInstance->AddCommand(mycommand); - } - - virtual ~ModuleCheck() + ModuleCheck() : mycommand(this) { + ServerInstance->AddCommand(&mycommand); } - virtual Version GetVersion() + ~ModuleCheck() { - return Version("$Id$", VF_VENDOR, API_VERSION); } - virtual void ProtoSendMetaData(void* opaque, TargetTypeFlags type, void* target, const std::string& name, const std::string& value) + Version GetVersion() { - User* user = static_cast(opaque); - user->WriteServ("304 " + std::string(user->nick) + " :CHECK meta:" + name + " " + value); - mycommand->md_sent = true; + return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON); } };