From 5801272a4ab462cf3258e02ddf612ed573aa5b34 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 19 Mar 2016 16:32:25 +0100 Subject: m_check Refactor, move to the new RPL_CHECK numeric --- include/numericbuilder.h | 17 +++++ src/modules/m_check.cpp | 182 ++++++++++++++++++++++++++--------------------- 2 files changed, 119 insertions(+), 80 deletions(-) diff --git a/include/numericbuilder.h b/include/numericbuilder.h index a7b83125f..b09958986 100644 --- a/include/numericbuilder.h +++ b/include/numericbuilder.h @@ -22,6 +22,7 @@ namespace Numeric { class WriteNumericSink; + class WriteRemoteNumericSink; template class GenericBuilder; @@ -46,6 +47,22 @@ class Numeric::WriteNumericSink } }; +class Numeric::WriteRemoteNumericSink +{ + User* const user; + + public: + WriteRemoteNumericSink(User* u) + : user(u) + { + } + + void operator()(Numeric& numeric) const + { + user->WriteRemoteNumeric(numeric); + } +}; + template class Numeric::GenericBuilder { diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index b6665f29b..a45b84c7d 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -23,6 +23,47 @@ #include "inspircd.h" #include "listmode.h" +enum +{ + RPL_CHECK = 802 +}; + +class CheckContext +{ + User* const user; + const std::string& target; + + public: + CheckContext(User* u, const std::string& targetstr) + : user(u) + , target(targetstr) + { + Write("START", target); + } + + ~CheckContext() + { + Write("END", target); + } + + void Write(const std::string& type, const std::string& text) + { + user->WriteRemoteNumeric(RPL_CHECK, type, text); + } + + User* GetUser() const { return user; } + + class List : public Numeric::GenericBuilder<' ', false, Numeric::WriteRemoteNumericSink> + { + public: + List(CheckContext& context, const char* checktype) + : Numeric::GenericBuilder<' ', false, Numeric::WriteRemoteNumericSink>(Numeric::WriteRemoteNumericSink(context.GetUser()), RPL_CHECK, false, (IS_LOCAL(context.GetUser()) ? context.GetUser()->nick.length() : ServerInstance->Config->Limits.NickMax) + strlen(checktype) + 1) + { + GetNumeric().push(checktype).push(std::string()); + } + }; +}; + /** Handle /CHECK */ class CommandCheck : public Command @@ -40,25 +81,16 @@ class CommandCheck : public Command return ret; } - static void dumpListMode(User* user, const std::string& checkstr, const ListModeBase::ModeList* list) + static void dumpListMode(CheckContext& context, const ListModeBase::ModeList* list) { if (!list) return; - std::string buf = checkstr + " modelist"; - const std::string::size_type headlen = buf.length(); - const size_t maxline = ServerInstance->Config->Limits.MaxLine; + CheckContext::List modelist(context, "modelist"); for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i) - { - if (buf.size() + i->mask.size() + 1 > maxline) - { - user->SendText(buf); - buf.erase(headlen); - } - buf.append(" ").append(i->mask); - } - if (buf.length() > headlen) - user->SendText(buf); + modelist.Add(i->mask); + + modelist.Flush(); } public: @@ -79,20 +111,20 @@ class CommandCheck : public Command return ret; } - void dumpExt(User* user, const std::string& checkstr, Extensible* ext) + void dumpExt(CheckContext& context, Extensible* ext) { - std::stringstream dumpkeys; + CheckContext::List extlist(context, "metadata"); for(Extensible::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()) - user->SendText(checkstr + " meta:" + item->name + " " + value); + context.Write("meta:" + item->name, value); else if (!item->name.empty()) - dumpkeys << " " << item->name; + extlist.Add(item->name); } - if (!dumpkeys.str().empty()) - user->SendText(checkstr + " metadata", dumpkeys); + + extlist.Flush(); } CmdResult Handle (const std::vector ¶meters, User *user) @@ -102,51 +134,49 @@ class CommandCheck : public Command User *targuser; Channel *targchan; - std::string checkstr; std::string chliststr; - checkstr = ":" + ServerInstance->Config->ServerName + " 304 " + user->nick + " :CHECK"; - targuser = ServerInstance->FindNick(parameters[0]); targchan = ServerInstance->FindChan(parameters[0]); /* * Syntax of a /check reply: - * :server.name 304 target :CHECK START - * :server.name 304 target :CHECK - * :server.name 304 target :CHECK END + * :server.name 802 target START + * :server.name 802 target : + * :server.name 802 target END */ - user->SendText(checkstr + " START " + parameters[0]); + // Constructor sends START, destructor sends END + CheckContext context(user, parameters[0]); if (targuser) { LocalUser* loctarg = IS_LOCAL(targuser); /* /check on a user */ - user->SendText(checkstr + " nuh " + targuser->GetFullHost()); - user->SendText(checkstr + " realnuh " + targuser->GetFullRealHost()); - user->SendText(checkstr + " realname " + targuser->fullname); - user->SendText(checkstr + " modes +" + targuser->FormatModes()); - user->SendText(checkstr + " snomasks " + GetSnomasks(targuser)); - user->SendText(checkstr + " server " + targuser->server->GetName()); - user->SendText(checkstr + " uid " + targuser->uuid); - user->SendText(checkstr + " signon " + timestring(targuser->signon)); - user->SendText(checkstr + " nickts " + timestring(targuser->age)); + context.Write("nuh", targuser->GetFullHost()); + context.Write("realnuh", targuser->GetFullRealHost()); + context.Write("realname", targuser->fullname); + context.Write("modes", std::string("+") + targuser->FormatModes()); + context.Write("snomasks", GetSnomasks(targuser)); + context.Write("server", targuser->server->GetName()); + context.Write("uid", targuser->uuid); + context.Write("signon", timestring(targuser->signon)); + context.Write("nickts", timestring(targuser->age)); if (loctarg) - user->SendText(checkstr + " lastmsg " + timestring(loctarg->idle_lastmsg)); + context.Write("lastmsg", timestring(loctarg->idle_lastmsg)); if (targuser->IsAway()) { /* user is away */ - user->SendText(checkstr + " awaytime " + timestring(targuser->awaytime)); - user->SendText(checkstr + " awaymsg " + targuser->awaymsg); + context.Write("awaytime", timestring(targuser->awaytime)); + context.Write("awaymsg", targuser->awaymsg); } if (targuser->IsOper()) { OperInfo* oper = targuser->oper; /* user is an oper of type ____ */ - user->SendText(checkstr + " opertype " + oper->name); + context.Write("opertype", oper->name); if (loctarg) { std::string umodes; @@ -160,38 +190,32 @@ class CommandCheck : public Command if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_CHANNEL)) cmodes.push_back(c); } - user->SendText(checkstr + " modeperms user=" + umodes + " channel=" + cmodes); - std::string opcmds; + context.Write("modeperms", "user=" + umodes + " channel=" + cmodes); + + CheckContext::List opcmdlist(context, "commandperms"); for (OperInfo::PrivSet::const_iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); ++i) - { - opcmds.push_back(' '); - opcmds.append(*i); - } - std::stringstream opcmddump(opcmds); - user->SendText(checkstr + " commandperms", opcmddump); - std::string privs; + opcmdlist.Add(*i); + opcmdlist.Flush(); + CheckContext::List privlist(context, "permissions"); for (OperInfo::PrivSet::const_iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); ++i) - { - privs.push_back(' '); - privs.append(*i); - } - std::stringstream privdump(privs); - user->SendText(checkstr + " permissions", privdump); + privlist.Add(*i); + privlist.Flush(); } } if (loctarg) { - user->SendText(checkstr + " clientaddr " + loctarg->client_sa.str()); - user->SendText(checkstr + " serveraddr " + loctarg->server_sa.str()); + context.Write("clientaddr", loctarg->client_sa.str()); + context.Write("serveraddr", loctarg->server_sa.str()); std::string classname = loctarg->GetClass()->name; if (!classname.empty()) - user->SendText(checkstr + " connectclass " + classname); + context.Write("connectclass", classname); } else - user->SendText(checkstr + " onip " + targuser->GetIPString()); + context.Write("onip", targuser->GetIPString()); + CheckContext::List chanlist(context, "onchans"); for (User::ChanList::iterator i = targuser->chans.begin(); i != targuser->chans.end(); i++) { Membership* memb = *i; @@ -199,30 +223,30 @@ class CommandCheck : public Command char prefix = memb->GetPrefixChar(); if (prefix) chliststr.push_back(prefix); - chliststr.append(c->name).push_back(' '); + chliststr.append(c->name); + chanlist.Add(chliststr); + chliststr.clear(); } - std::stringstream dump(chliststr); + chanlist.Flush(); - user->SendText(checkstr + " onchans", dump); - - dumpExt(user, checkstr, targuser); + dumpExt(context, targuser); } else if (targchan) { /* /check on a channel */ - user->SendText(checkstr + " timestamp " + timestring(targchan->age)); + context.Write("timestamp", timestring(targchan->age)); if (!targchan->topic.empty()) { /* there is a topic, assume topic related information exists */ - user->SendText(checkstr + " topic " + targchan->topic); - user->SendText(checkstr + " topic_setby " + targchan->setby); - user->SendText(checkstr + " topic_setat " + timestring(targchan->topicset)); + context.Write("topic", targchan->topic); + context.Write("topic_setby", targchan->setby); + context.Write("topic_setat", timestring(targchan->topicset)); } - user->SendText(checkstr + " modes " + targchan->ChanModes(true)); - user->SendText(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); + context.Write("modes", targchan->ChanModes(true)); + context.Write("membercount", ConvToStr(targchan->GetUserCounter())); /* now the ugly bit, spool current members of a channel. :| */ @@ -235,17 +259,16 @@ class CommandCheck : public Command * Unlike Asuka, I define a clone as coming from the same host. --w00t */ const UserManager::CloneCounts& clonecount = ServerInstance->Users->GetCloneCounts(i->first); - user->SendText("%s member %-3u %s%s (%s@%s) %s ", - checkstr.c_str(), clonecount.global, + context.Write("member", InspIRCd::Format("%-3u %s%s (%s@%s) %s ", clonecount.global, i->second->GetAllPrefixChars(), i->first->nick.c_str(), - i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str()); + i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str())); } const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes(); for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i) - dumpListMode(user, checkstr, (*i)->GetList(targchan)); + dumpListMode(context, (*i)->GetList(targchan)); - dumpExt(user, checkstr, targchan); + dumpExt(context, targchan); } else { @@ -259,21 +282,20 @@ 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->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname); + context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname); } /* IP address */ else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0])) { /* same IP. */ - user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname); + context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname); } } - user->SendText(checkstr + " matches " + ConvToStr(x)); + context.Write("matches", ConvToStr(x)); } - user->SendText(checkstr + " END " + parameters[0]); - + // END is sent by the CheckContext destructor return CMD_SUCCESS; } -- cgit v1.2.3 From 1520f1d71654f45f4faec367ac02f03e27fd8960 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 19 Mar 2016 16:33:00 +0100 Subject: m_check Move DumpListMode() into CheckContext --- src/modules/m_check.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index a45b84c7d..95e063e4d 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -53,6 +53,18 @@ class CheckContext User* GetUser() const { return user; } + void DumpListMode(const ListModeBase::ModeList* list) + { + if (!list) + return; + + CheckContext::List modelist(*this, "modelist"); + for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i) + modelist.Add(i->mask); + + modelist.Flush(); + } + class List : public Numeric::GenericBuilder<' ', false, Numeric::WriteRemoteNumericSink> { public: @@ -81,18 +93,6 @@ class CommandCheck : public Command return ret; } - static void dumpListMode(CheckContext& context, const ListModeBase::ModeList* list) - { - if (!list) - return; - - CheckContext::List modelist(context, "modelist"); - for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i) - modelist.Add(i->mask); - - modelist.Flush(); - } - public: CommandCheck(Module* parent) : Command(parent,"CHECK", 1) @@ -266,7 +266,7 @@ class CommandCheck : public Command const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes(); for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i) - dumpListMode(context, (*i)->GetList(targchan)); + context.DumpListMode((*i)->GetList(targchan)); dumpExt(context, targchan); } -- cgit v1.2.3 From d47b1550edf74e1b5756d6e0ed6561559b5f5162 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 19 Mar 2016 16:33:23 +0100 Subject: m_check Move DumpExt() into CheckContext --- src/modules/m_check.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 95e063e4d..ef9507aa1 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -65,6 +65,22 @@ class CheckContext modelist.Flush(); } + void DumpExt(Extensible* ext) + { + CheckContext::List extlist(*this, "metadata"); + for(Extensible::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()) + Write("meta:" + item->name, value); + else if (!item->name.empty()) + extlist.Add(item->name); + } + + extlist.Flush(); + } + class List : public Numeric::GenericBuilder<' ', false, Numeric::WriteRemoteNumericSink> { public: @@ -111,22 +127,6 @@ class CommandCheck : public Command return ret; } - void dumpExt(CheckContext& context, Extensible* ext) - { - CheckContext::List extlist(context, "metadata"); - for(Extensible::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()) - context.Write("meta:" + item->name, value); - else if (!item->name.empty()) - extlist.Add(item->name); - } - - extlist.Flush(); - } - CmdResult Handle (const std::vector ¶meters, User *user) { if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName) @@ -230,7 +230,7 @@ class CommandCheck : public Command chanlist.Flush(); - dumpExt(context, targuser); + context.DumpExt(targuser); } else if (targchan) { @@ -268,7 +268,7 @@ class CommandCheck : public Command for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i) context.DumpListMode((*i)->GetList(targchan)); - dumpExt(context, targchan); + context.DumpExt(targchan); } else { -- cgit v1.2.3 From 3aa92b8d13f57b228d565df23cdad4c720d5cff0 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Tue, 22 Mar 2016 16:40:05 +0100 Subject: Add Numeric::ParamBuilder It builds numerics where the individual components are parameters of the numeric --- include/numericbuilder.h | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/include/numericbuilder.h b/include/numericbuilder.h index a7b83125f..cd418ea11 100644 --- a/include/numericbuilder.h +++ b/include/numericbuilder.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2015 Attila Molnar + * Copyright (C) 2015-2016 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -28,6 +28,12 @@ namespace Numeric template class Builder; + + template + class GenericParamBuilder; + + template + class ParamBuilder; } class Numeric::WriteNumericSink @@ -113,3 +119,63 @@ class Numeric::Builder : public GenericBuilder { } }; + +template +class Numeric::GenericParamBuilder +{ + Sink sink; + Numeric numeric; + std::string::size_type currlen; + std::string::size_type max; + + bool HasRoom(const std::string::size_type additional) const + { + return (currlen + additional <= max); + } + + public: + GenericParamBuilder(Sink s, unsigned int num, size_t additionalsize) + : sink(s) + , numeric(num) + , currlen(0) + , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 10) + { + } + + void AddStatic(const std::string& entry) + { + max -= (entry.length() + 1); + numeric.GetParams().push_back(entry); + } + + void Add(const std::string& entry) + { + if (!HasRoom(entry.size())) + Flush(); + + currlen += entry.size() + 1; + numeric.GetParams().push_back(entry); + } + + void Flush() + { + if ((!SendEmpty) && (IsEmpty())) + return; + + sink(numeric); + currlen = 0; + numeric.GetParams().erase(numeric.GetParams().begin() + NumStaticParams, numeric.GetParams().end()); + } + + bool IsEmpty() const { return (numeric.GetParams().size() <= NumStaticParams); } +}; + +template +class Numeric::ParamBuilder : public GenericParamBuilder +{ + public: + ParamBuilder(LocalUser* user, unsigned int num) + : ::Numeric::GenericParamBuilder(WriteNumericSink(user), num, user->nick.size()) + { + } +}; -- cgit v1.2.3 From 0de5aa7c5cfff6d2389f1adcc41d6b2deeec2bc4 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Tue, 22 Mar 2016 16:44:45 +0100 Subject: m_namedmodes Inherit command handler from SplitCommand Pass a LocalUser pointer to DisplayList() --- src/modules/m_namedmodes.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp index 10bef981a..9c7b24666 100644 --- a/src/modules/m_namedmodes.cpp +++ b/src/modules/m_namedmodes.cpp @@ -19,7 +19,7 @@ #include "inspircd.h" -static void DisplayList(User* user, Channel* channel) +static void DisplayList(LocalUser* user, Channel* channel) { std::stringstream items; const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL); @@ -42,15 +42,16 @@ static void DisplayList(User* user, Channel* channel) user->WriteNumeric(960, channel->name, "End of mode list"); } -class CommandProp : public Command +class CommandProp : public SplitCommand { public: - CommandProp(Module* parent) : Command(parent, "PROP", 1) + CommandProp(Module* parent) + : SplitCommand(parent, "PROP", 1) { syntax = " {[+-] []}*"; } - CmdResult Handle(const std::vector ¶meters, User *src) + CmdResult HandleLocal(const std::vector& parameters, LocalUser* src) { Channel* const chan = ServerInstance->FindChan(parameters[0]); if (!chan) @@ -103,7 +104,8 @@ class DummyZ : public ModeHandler // Handle /MODE #chan Z void DisplayList(User* user, Channel* chan) { - ::DisplayList(user, chan); + if (IS_LOCAL(user)) + ::DisplayList(static_cast(user), chan); } }; -- cgit v1.2.3 From f71fe202e54f90190f3b5562de7926eb8265f3e5 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Tue, 22 Mar 2016 16:46:15 +0100 Subject: m_namedmodes Switch to Numeric::ParamBuilder --- src/modules/m_namedmodes.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp index 9c7b24666..d4263d899 100644 --- a/src/modules/m_namedmodes.cpp +++ b/src/modules/m_namedmodes.cpp @@ -21,24 +21,25 @@ static void DisplayList(LocalUser* user, Channel* channel) { - std::stringstream items; + Numeric::ParamBuilder<1> numeric(user, 961); + numeric.AddStatic(channel->name); + const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL); for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i) { ModeHandler* mh = i->second; if (!channel->IsModeSet(mh)) continue; - items << " +" << mh->name; + numeric.Add("+" + mh->name); if (mh->GetNumParams(true)) { if ((mh->name == "key") && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex"))) - items << " "; + numeric.Add(""); else - items << " " << channel->GetModeParameter(mh); + numeric.Add(channel->GetModeParameter(mh)); } } - const std::string line = ":" + ServerInstance->Config->ServerName + " 961 " + user->nick + " " + channel->name; - user->SendText(line, items); + numeric.Flush(); user->WriteNumeric(960, channel->name, "End of mode list"); } -- cgit v1.2.3