summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_spanningtree/commands.h16
-rw-r--r--src/modules/m_spanningtree/compat.cpp90
-rw-r--r--src/modules/m_spanningtree/main.cpp2
-rw-r--r--src/modules/m_spanningtree/num.cpp62
-rw-r--r--src/modules/m_spanningtree/remoteuser.cpp33
-rw-r--r--src/modules/m_spanningtree/remoteuser.h32
-rw-r--r--src/modules/m_spanningtree/uid.cpp3
-rw-r--r--src/users.cpp6
8 files changed, 239 insertions, 5 deletions
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 1f7456426..4810e9d4b 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -21,6 +21,7 @@
#include "servercommand.h"
#include "commandbuilder.h"
+#include "remoteuser.h"
/** Handle /RCONNECT
*/
@@ -369,6 +370,20 @@ class CommandSInfo : public ServerOnlyServerCommand<CommandSInfo>
};
};
+class CommandNum : public ServerOnlyServerCommand<CommandNum>
+{
+ public:
+ CommandNum(Module* Creator) : ServerOnlyServerCommand<CommandNum>(Creator, "NUM", 3) { }
+ CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+
+ class Builder : public CmdBuilder
+ {
+ public:
+ Builder(SpanningTree::RemoteUser* target, const Numeric::Numeric& numeric);
+ };
+};
+
class SpanningTreeCommands
{
public:
@@ -401,5 +416,6 @@ class SpanningTreeCommands
CommandSNONotice snonotice;
CommandEndBurst endburst;
CommandSInfo sinfo;
+ CommandNum num;
SpanningTreeCommands(ModuleSpanningTree* module);
};
diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 41b5488f0..63fc9cf6c 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -290,6 +290,25 @@ void TreeSocket::WriteLine(const std::string& original_line)
line = CmdBuilder(line.substr(spcolon-3, 3), "BURST").push_int(ServerInstance->Time()).str();
}
}
+ else if (command == "NUM")
+ {
+ // :<sid> NUM <numeric source sid> <target uuid> <3 digit number> <params>
+ // Translate to
+ // :<sid> PUSH <target uuid> :<numeric source name> <3 digit number> <target nick> <params>
+
+ TreeServer* const numericsource = Utils->FindServerID(line.substr(9, 3));
+ if (!numericsource)
+ return;
+
+ // The nick of the target is necessary for building the PUSH message
+ User* const target = ServerInstance->FindUUID(line.substr(13, UIDGenerator::UUID_LENGTH));
+ if (!target)
+ return;
+
+ std::string push = InspIRCd::Format(":%.*s PUSH %s ::%s %.*s %s", 3, line.c_str()+1, target->uuid.c_str(), numericsource->GetName().c_str(), 3, line.c_str()+23, target->nick.c_str());
+ push.append(line, 26, std::string::npos);
+ push.swap(line);
+ }
}
WriteLineNoCompat(line);
return;
@@ -485,6 +504,77 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
// SVSWATCH was removed because nothing was using it, but better be sure
return false;
}
+ else if (cmd == "PUSH")
+ {
+ if ((params.size() != 2) || (!this->MyRoot))
+ return false; // Huh?
+
+ irc::tokenstream ts(params.back());
+
+ std::string srcstr;
+ ts.GetToken(srcstr);
+ srcstr.erase(0, 1);
+
+ std::string token;
+ ts.GetToken(token);
+
+ // See if it's a numeric being sent to the target via PUSH
+ unsigned int numeric_number = 0;
+ if (token.length() == 3)
+ numeric_number = ConvToInt(token);
+
+ if ((numeric_number > 0) && (numeric_number < 1000))
+ {
+ // It's a numeric, translate to NUM
+
+ // srcstr must be a valid server name
+ TreeServer* const numericsource = Utils->FindServer(srcstr);
+ if (!numericsource)
+ {
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Unable to translate PUSH numeric %s to user %s from 1202 protocol server %s: source \"%s\" doesn't exist", token.c_str(), params[0].c_str(), this->MyRoot->GetName().c_str(), srcstr.c_str());
+ return false;
+ }
+
+ cmd = "NUM";
+
+ // Second parameter becomes the target uuid
+ params[0].swap(params[1]);
+ // Replace first param (now the PUSH payload, not needed) with the source sid
+ params[0] = numericsource->GetID();
+
+ params.push_back(InspIRCd::Format("%03u", numeric_number));
+
+ // Ignore the nickname in the numeric in PUSH
+ ts.GetToken(token);
+
+ // Rest of the tokens are the numeric parameters, add them to NUM
+ while (ts.GetToken(token))
+ params.push_back(token);
+ }
+ else if ((token == "PRIVMSG") || (token == "NOTICE"))
+ {
+ // Command is a PRIVMSG/NOTICE
+ cmd.swap(token);
+
+ // Check if the PRIVMSG/NOTICE target is a nickname
+ ts.GetToken(token);
+ if (token.c_str()[0] == '#')
+ {
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Unable to translate PUSH %s to user %s from 1202 protocol server %s, target \"%s\"", cmd.c_str(), params[0].c_str(), this->MyRoot->GetName().c_str(), token.c_str());
+ return false;
+ }
+
+ // Replace second parameter with the message
+ ts.GetToken(params[1]);
+ }
+ else
+ {
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unable to translate PUSH to user %s from 1202 protocol server %s", params[0].c_str(), this->MyRoot->GetName().c_str());
+ return false;
+ }
+
+ return true;
+ }
return true; // Passthru
}
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index d06755c1f..7f88a07f5 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -52,7 +52,7 @@ SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
away(module), addline(module), delline(module), encap(module), idle(module),
nick(module), ping(module), pong(module), push(module), save(module),
server(module), squit(module), snonotice(module),
- endburst(module), sinfo(module)
+ endburst(module), sinfo(module), num(module)
{
}
diff --git a/src/modules/m_spanningtree/num.cpp b/src/modules/m_spanningtree/num.cpp
new file mode 100644
index 000000000..2c8697c9a
--- /dev/null
+++ b/src/modules/m_spanningtree/num.cpp
@@ -0,0 +1,62 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+
+#include "utils.h"
+#include "commands.h"
+#include "remoteuser.h"
+
+CmdResult CommandNum::HandleServer(TreeServer* server, std::vector<std::string>& params)
+{
+ User* const target = ServerInstance->FindUUID(params[1]);
+ if (!target)
+ return CMD_FAILURE;
+
+ LocalUser* const localtarget = IS_LOCAL(target);
+ if (!localtarget)
+ return CMD_SUCCESS;
+
+ Numeric::Numeric numeric(ConvToInt(params[2]));
+ // Passing NULL is ok, in that case the numeric source becomes this server
+ numeric.SetServer(Utils->FindServerID(params[0]));
+ numeric.GetParams().insert(numeric.GetParams().end(), params.begin()+3, params.end());
+
+ localtarget->WriteNumeric(numeric);
+ return CMD_SUCCESS;
+}
+
+RouteDescriptor CommandNum::GetRouting(User* user, const std::vector<std::string>& params)
+{
+ return ROUTE_UNICAST(params[1]);
+}
+
+CommandNum::Builder::Builder(SpanningTree::RemoteUser* target, const Numeric::Numeric& numeric)
+ : CmdBuilder("NUM")
+{
+ TreeServer* const server = (numeric.GetServer() ? (static_cast<TreeServer*>(numeric.GetServer())) : Utils->TreeRoot);
+ push(server->GetID()).push(target->uuid).push(InspIRCd::Format("%03u", numeric.GetNumeric()));
+ const std::vector<std::string>& params = numeric.GetParams();
+ if (!params.empty())
+ {
+ for (std::vector<std::string>::const_iterator i = params.begin(); i != params.end()-1; ++i)
+ push(*i);
+ push_last(params.back());
+ }
+}
diff --git a/src/modules/m_spanningtree/remoteuser.cpp b/src/modules/m_spanningtree/remoteuser.cpp
new file mode 100644
index 000000000..717a6fd9f
--- /dev/null
+++ b/src/modules/m_spanningtree/remoteuser.cpp
@@ -0,0 +1,33 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+
+#include "main.h"
+#include "remoteuser.h"
+
+SpanningTree::RemoteUser::RemoteUser(const std::string& uid, Server* srv)
+ : ::RemoteUser(uid, srv)
+{
+}
+
+void SpanningTree::RemoteUser::WriteRemoteNumeric(const Numeric::Numeric& numeric)
+{
+ CommandNum::Builder(this, numeric).Unicast(this);
+}
diff --git a/src/modules/m_spanningtree/remoteuser.h b/src/modules/m_spanningtree/remoteuser.h
new file mode 100644
index 000000000..416f2f760
--- /dev/null
+++ b/src/modules/m_spanningtree/remoteuser.h
@@ -0,0 +1,32 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+namespace SpanningTree
+{
+ class RemoteUser;
+}
+
+class SpanningTree::RemoteUser : public ::RemoteUser
+{
+ public:
+ RemoteUser(const std::string& uid, Server* srv);
+ void WriteRemoteNumeric(const Numeric::Numeric& numeric) CXX11_OVERRIDE;
+};
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 01465670a..eff537119 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -24,6 +24,7 @@
#include "utils.h"
#include "treeserver.h"
+#include "remoteuser.h"
CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::string>& params)
{
@@ -73,7 +74,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
/* For remote users, we pass the UUID they sent to the constructor.
* If the UUID already exists User::User() throws an exception which causes this connection to be closed.
*/
- RemoteUser* _new = new RemoteUser(params[0], remoteserver);
+ RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver);
ServerInstance->Users->clientlist[params[2]] = _new;
_new->nick = params[2];
_new->host = params[3];
diff --git a/src/users.cpp b/src/users.cpp
index 12fb902fb..7437e8a20 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -811,7 +811,8 @@ void User::WriteNumeric(const Numeric::Numeric& numeric)
if (MOD_RESULT == MOD_RES_DENY)
return;
- this->Write(BuildNumeric(ServerInstance->Config->ServerName, this, numeric.GetNumeric(), numeric.GetParams()));
+ const std::string& servername = (numeric.GetServer() ? numeric.GetServer()->GetName() : ServerInstance->Config->ServerName);
+ this->Write(BuildNumeric(servername, this, numeric.GetNumeric(), numeric.GetParams()));
}
void User::WriteFrom(User *user, const std::string &text)
@@ -949,8 +950,7 @@ void User::SendText(const char *text, ...)
void User::WriteRemoteNumeric(const Numeric::Numeric& numeric)
{
- const std::string& servername = (numeric.GetServer() ? numeric.GetServer()->GetName() : ServerInstance->Config->ServerName);
- SendText(BuildNumeric(servername, this, numeric.GetNumeric(), numeric.GetParams()));
+ WriteNumeric(numeric);
}
/* return 0 or 1 depending if users u and u2 share one or more common channels
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 09:14:12 +0000