-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2007-2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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 "socket.h"
-#include "xline.h"
-#include "socketengine.h"
#include "main.h"
#include "utils.h"
#include "treeserver.h"
-#include "link.h"
#include "treesocket.h"
#include "resolvers.h"
/* Handle ERROR command */
-bool TreeSocket::Error(parameterlist ¶ms)
+void TreeSocket::Error(parameterlist ¶ms)
{
- if (params.size() < 1)
- return false;
- ServerInstance->SNO->WriteToSnoMask('l',"ERROR from %s: %s",(!InboundServerName.empty() ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str());
- /* we will return false to cause the socket to close. */
- return false;
+ std::string msg = params.size() ? params[0] : "";
+ SetError("received ERROR " + msg);
}
void TreeSocket::Split(const std::string& line, std::string& prefix, std::string& command, parameterlist& params)
if (!tokens.GetToken(prefix))
return;
-
+
if (prefix[0] == ':')
{
prefix = prefix.substr(1);
std::string command;
parameterlist params;
- ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] I %s", this->GetFd(), line.c_str());
+ ServerInstance->Logs->Log("m_spanningtree", LOG_RAWIO, "S[%d] I %s", this->GetFd(), line.c_str());
Split(line, prefix, command, params);
switch (this->LinkState)
{
- TreeServer* Node;
-
case WAIT_AUTH_1:
/*
* State WAIT_AUTH_1:
}
else
{
- this->SendError(std::string("Invalid command in negotiation phase: ") + command.c_str());
+ this->SendError("Invalid command in negotiation phase: " + command);
}
break;
case WAIT_AUTH_2:
{
if (params.size())
{
- time_t them = atoi(params[0].c_str());
+ time_t them = ConvToInt(params[0]);
time_t delta = them - ServerInstance->Time();
if ((delta < -600) || (delta > 600))
{
- ServerInstance->SNO->WriteToSnoMask('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs((long)delta));
+ ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs((long)delta));
SendError("Your clocks are out by "+ConvToStr(abs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
return;
}
else if ((delta < -30) || (delta > 30))
{
- ServerInstance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta));
+ ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta));
}
}
- this->LinkState = CONNECTED;
+ // Check for duplicate server name/sid again, it's possible that a new
+ // server was introduced while we were waiting for them to send BURST.
+ // (we do not reserve their server name/sid when they send SERVER, we do it now)
+ if (!CheckDuplicate(capab->name, capab->sid))
+ return;
+
+ this->LinkState = CONNECTED;
Utils->timeoutlist.erase(this);
- Link* lnk = Utils->FindLink(InboundServerName);
+ linkID = capab->name;
+
+ MyRoot = new TreeServer(Utils, capab->name, capab->description, capab->sid, Utils->TreeRoot, this, capab->hidden);
+ Utils->TreeRoot->AddChild(MyRoot);
- Node = new TreeServer(this->Utils, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false);
+ MyRoot->bursting = true;
+ this->DoBurst(MyRoot);
- Utils->TreeRoot->AddChild(Node);
parameterlist sparams;
- sparams.push_back(InboundServerName);
+ sparams.push_back(MyRoot->GetName());
sparams.push_back("*");
- sparams.push_back("1");
- sparams.push_back(InboundSID);
- sparams.push_back(":"+InboundDescription);
- Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(),"SERVER",sparams,InboundServerName);
- Utils->DoOneToAllButSender(prefix, "BURST", params, InboundServerName);
- Node->bursting = true;
- this->DoBurst(Node);
+ sparams.push_back("0");
+ sparams.push_back(MyRoot->GetID());
+ sparams.push_back(":" + MyRoot->GetDesc());
+ Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(), "SERVER", sparams, MyRoot->GetName());
+ Utils->DoOneToAllButSender(MyRoot->GetID(), "BURST", params, MyRoot->GetName());
}
else if (command == "ERROR")
{
*/
this->ProcessConnectedLine(prefix, command, params);
break;
+ case DYING:
+ break;
}
}
User* who = ServerInstance->FindUUID(prefix);
std::string direction;
- if (who)
- {
- direction = who->server;
- }
- else
+ if (!who)
{
TreeServer* ServerSource = Utils->FindServer(prefix);
if (prefix.empty())
- ServerSource = Utils->FindServer(GetName());
+ ServerSource = MyRoot;
if (ServerSource)
{
- who = Utils->ServerUser;
- Utils->ServerUser->SetFakeServer(ServerSource->GetName());
- Utils->ServerUser->uuid = ServerSource->GetID();
- direction = prefix;
+ who = ServerSource->ServerUser;
}
else
{
* due to various race conditions such as the KILL message for a user somehow
* crossing the users QUIT further upstream from the server. Thanks jilles!
*/
- ServerInstance->Logs->Log("m_spanningtree", DEBUG, "Command '%s' from unknown prefix '%s'! Dropping entire command.",
- command.c_str(), prefix.c_str());
- return;
+
+ if ((prefix.length() == UIDGenerator::UUID_LENGTH) && (isdigit(prefix[0])) &&
+ ((command == "FMODE") || (command == "MODE") || (command == "KICK") || (command == "TOPIC") || (command == "KILL") || (command == "ADDLINE") || (command == "DELLINE")))
+ {
+ /* Special case, we cannot drop these commands as they've been committed already on a
+ * part of the network by the time we receive them, so in this scenario pretend the
+ * command came from a server to avoid desync.
+ */
+
+ who = ServerInstance->FindUUID(prefix.substr(0, 3));
+ if (!who)
+ who = this->MyRoot->ServerUser;
+ }
+ else
+ {
+ ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "Command '%s' from unknown prefix '%s'! Dropping entire command.",
+ command.c_str(), prefix.c_str());
+ return;
+ }
}
}
// Make sure prefix is still good
+ direction = who->server;
prefix = who->uuid;
/*
if ((!route_back_again) || (route_back_again->GetSocket() != this))
{
if (route_back_again)
- ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Protocol violation: Fake direction '%s' from connection '%s'",
- prefix.c_str(),this->GetName().c_str());
+ ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"Protocol violation: Fake direction '%s' from connection '%s'",
+ prefix.c_str(),linkID.c_str());
return;
}
if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
command = "MODE";
- // TODO move all this into Commands
- if (command == "UID")
- {
- this->ParseUID(prefix, params);
- }
- else if (command == "FJOIN")
- {
- this->ForceJoin(prefix,params);
- }
- else if (command == "STATS")
- {
- this->Stats(prefix, params);
- }
- else if (command == "MOTD")
- {
- this->Motd(prefix, params);
- }
- else if (command == "ADMIN")
+ if (proto_version < ProtocolVersion)
{
- this->Admin(prefix, params);
+ if (!PreProcessOldProtocolMessage(who, command, params))
+ return;
}
- else if (command == "MAP")
+
+ // TODO move all this into Commands
+ if (command == "MAP")
{
Utils->Creator->HandleMap(params, who);
}
{
this->Error(params);
}
- else if (command == "OPERTYPE")
- {
- this->OperType(prefix,params);
- }
else if (command == "AWAY")
{
this->Away(prefix,params);
}
- else if (command == "FMODE")
- {
- this->ForceMode(prefix,params);
- }
- else if (command == "FTOPIC")
- {
- this->ForceTopic(prefix,params);
- }
- else if (command == "METADATA")
- {
- this->MetaData(prefix,params);
- }
else if (command == "PING")
{
this->LocalPing(prefix,params);
TreeServer *s = Utils->FindServer(prefix);
if (s && s->bursting)
{
- ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst (send ENDBURST!)", prefix.c_str());
+ ServerInstance->SNO->WriteGlobalSno('l',"Server \002%s\002 has not finished burst, forcing end of burst (send ENDBURST!)", prefix.c_str());
s->FinishBurst();
}
this->LocalPong(prefix,params);
{
this->ServerVersion(prefix,params);
}
- else if (command == "FHOST")
- {
- this->ChangeHost(prefix,params);
- }
- else if (command == "FNAME")
- {
- this->ChangeName(prefix,params);
- }
- else if (command == "FIDENT")
- {
- this->ChangeIdent(prefix,params);
- }
else if (command == "ADDLINE")
{
this->AddLine(prefix,params);
{
this->DelLine(prefix,params);
}
- else if (command == "SVSNICK")
- {
- this->SVSNick(prefix,params);
- }
else if (command == "SAVE")
{
this->ForceNick(prefix,params);
{
this->Push(prefix,params);
}
- else if (command == "TIME")
- {
- this->Time(prefix,params);
- }
- else if (command == "SVSJOIN")
- {
- this->ServiceJoin(prefix,params);
- }
- else if (command == "SVSPART")
- {
- this->ServicePart(prefix,params);
- }
else if (command == "SQUIT")
{
if (params.size() == 2)
this->Squit(Utils->FindServer(params[0]),params[1]);
}
}
- else if (command == "MODENOTICE")
- {
- if (params.size() >= 2)
- {
- ServerInstance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s",
- who->nick.c_str(), params[1].c_str());
- }
- Utils->DoOneToAllButSender(prefix, command, params, prefix);
- }
else if (command == "SNONOTICE")
{
if (params.size() >= 2)
{
- ServerInstance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + who->nick + ": "+ params[1]);
+ ServerInstance->SNO->WriteToSnoMask(params[0][0], "From " + who->nick + ": "+ params[1]);
+ params[1] = ":" + params[1];
Utils->DoOneToAllButSender(prefix, command, params, prefix);
}
}
else if (command == "BURST")
{
// Set prefix server as bursting
- if (!IS_SERVER(who))
+ TreeServer* ServerSource = Utils->FindServer(prefix);
+ if (!ServerSource)
{
- ServerInstance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a non-server(?): %s", prefix.c_str());
+ ServerInstance->SNO->WriteGlobalSno('l', "WTF: Got BURST from a non-server(?): %s", prefix.c_str());
return;
}
- route_back_again->bursting = true;
+ ServerSource->bursting = true;
Utils->DoOneToAllButSender(prefix, command, params, prefix);
}
else if (command == "ENDBURST")
{
- if (!IS_SERVER(who))
+ TreeServer* ServerSource = Utils->FindServer(prefix);
+ if (!ServerSource)
{
- ServerInstance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a non-server(?): %s", prefix.c_str());
+ ServerInstance->SNO->WriteGlobalSno('l', "WTF: Got ENDBURST from a non-server(?): %s", prefix.c_str());
return;
}
- route_back_again->FinishBurst();
+ ServerSource->FinishBurst();
Utils->DoOneToAllButSender(prefix, command, params, prefix);
}
else if (command == "ENCAP")
{
- this->Encap(prefix, params);
+ this->Encap(who, params);
}
else if (command == "NICK")
{
if (params.size() != 2)
{
- SendError("Protocol violation: NICK message without TS - :"+std::string(who->uuid)+" NICK "+params[0]);
+ SendError("Protocol violation: Wrong number of parameters for NICK message");
return;
}
return;
}
+ if ((isdigit(params[0][0])) && (params[0] != who->uuid))
+ {
+ SendError("Protocol violation: User changing nick to an invalid UID - " + params[0]);
+ return;
+ }
+
/* Update timestamp on user when they change nicks */
- who->age = atoi(params[1].c_str());
+ who->age = ConvToInt(params[1]);
/*
* On nick messages, check that the nick doesnt already exist here.
else
{
Command* cmd = ServerInstance->Parser->GetHandler(command);
- CmdResult res = CMD_INVALID;
- if (cmd && params.size() >= cmd->min_params)
+
+ if (!cmd)
+ {
+ irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+ ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Unrecognised S2S command :%s %s %s",
+ who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
+ SendError("Unrecognised command '" + command + "' -- possibly loaded mismatched modules");
+ return;
+ }
+
+ if (params.size() < cmd->min_params)
+ {
+ irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+ ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Insufficient parameters for S2S command :%s %s %s",
+ who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
+ SendError("Insufficient parameters for command '" + command + "'");
+ return;
+ }
+
+ if ((!params.empty()) && (params.back().empty()) && (!cmd->allow_empty_last_param))
{
- res = cmd->Handle(params, who);
+ // the last param is empty and the command handler doesn't allow that, check if there will be enough params if we drop the last
+ if (params.size()-1 < cmd->min_params)
+ return;
+ params.pop_back();
}
+ CmdResult res = cmd->Handle(params, who);
+
if (res == CMD_INVALID)
- SendError("Unrecognised or malformed command '" + command + "' -- possibly loaded mismatched modules");
- if (res == CMD_SUCCESS)
+ {
+ irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+ ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Error handling S2S command :%s %s %s",
+ who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
+ SendError("Error handling '" + command + "' -- possibly loaded mismatched modules");
+ }
+ else if (res == CMD_SUCCESS)
Utils->RouteCommand(route_back_again, command, params, who);
}
}
-std::string TreeSocket::GetName()
-{
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
- {
- sourceserv = this->InboundServerName;
- }
- return sourceserv;
-}
-
void TreeSocket::OnTimeout()
{
- if (this->LinkState == CONNECTING)
- {
- ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Connection to \002%s\002 timed out.", myhost.c_str());
- Utils->Creator->ConnectServer(myautoconnect);
- }
+ ServerInstance->SNO->WriteGlobalSno('l', "CONNECT: Connection to \002%s\002 timed out.", linkID.c_str());
}
void TreeSocket::Close()
{
+ if (fd != -1)
+ ServerInstance->GlobalCulls.AddItem(this);
this->BufferedSocket::Close();
-
- // Test fix for big fuckup
- if (this->LinkState != CONNECTED)
- return;
+ SetError("Remote host closed connection");
// Connection closed.
// If the connection is fully up (state CONNECTED)
// then propogate a netsplit to all peers.
- std::string quitserver = this->myhost;
- if (!this->InboundServerName.empty())
- {
- quitserver = this->InboundServerName;
- }
- TreeServer* s = Utils->FindServer(quitserver);
- if (s)
- {
- Squit(s,"Remote host closed the connection");
- }
+ if (MyRoot)
+ Squit(MyRoot,getError());
- if (!quitserver.empty())
+ if (!ConnectionFailureShown)
{
- ServerInstance->SNO->WriteToSnoMask('l', "Connection to '\2%s\2' failed.",quitserver.c_str());
+ ConnectionFailureShown = true;
+ ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str());
time_t server_uptime = ServerInstance->Time() - this->age;
if (server_uptime)
- ServerInstance->SNO->WriteToSnoMask('l', "Connection to '\2%s\2' was established for %s", quitserver.c_str(), Utils->Creator->TimeToStr(server_uptime).c_str());
+ {
+ std::string timestr = Utils->Creator->TimeToStr(server_uptime);
+ ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str());
+ }
}
}
projects / user / henk / code / inspircd.git / blobdiff