ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_spanningtree: Parse and copy message tags for all cmds

Browse Source 
Don't ignore message tags on ServerCommands, and avoid creating
duplicate CommandBase::Params instances
This commit is contained in:
linuxdaemon 2019-04-27 17:35:31 -05:00 committed by Peter Powell
parent d4aab8d30a
commit 095d0e6154
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/m_spanningtree/treesocket2.cpp
View File

@ -377,21 +377,24 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
CmdResult res; CmdResult res;
ClientProtocol::TagMap tags; ClientProtocol::TagMap tags;
std::string tag;
irc::sepstream tagstream(taglist, ';');
while (tagstream.GetToken(tag))
ProcessTag(who, tag, tags);
CommandBase::Params newparams(params, tags);
if (scmd) if (scmd)
res = scmd->Handle(who, params); res = scmd->Handle(who, newparams);
else else
{ {
std::string tag; res = cmd->Handle(who, newparams);
irc::sepstream tagstream(taglist, ';');
while (tagstream.GetToken(tag))
ProcessTag(who, tag, tags);
res = cmd->Handle(who, CommandBase::Params(params, tags));
if (res == CMD_INVALID) if (res == CMD_INVALID)
throw ProtocolException("Error in command handler"); throw ProtocolException("Error in command handler");
} }
if (res == CMD_SUCCESS) if (res == CMD_SUCCESS)
Utils->RouteCommand(server->GetRoute(), cmdbase, CommandBase::Params(params, tags), who); Utils->RouteCommand(server->GetRoute(), cmdbase, newparams, who);
} }
void TreeSocket::OnTimeout() void TreeSocket::OnTimeout()