-/* +------------------------------------+
- * | 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 "../transport.h"
-#include "socketengine.h"
#include "main.h"
#include "utils.h"
#include "treeserver.h"
-#include "link.h"
#include "treesocket.h"
#include "resolvers.h"
-#include "handshaketimer.h"
-
-/* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/handshaketimer.h */
+#include "commands.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, parameterlist &n)
+void TreeSocket::Split(const std::string& line, std::string& prefix, std::string& command, parameterlist& params)
{
- n.clear();
irc::tokenstream tokens(line);
- std::string param;
- while (tokens.GetToken(param))
- {
- n.push_back(param);
- }
- return;
-}
-
-bool TreeSocket::ProcessLine(std::string &line)
-{
- parameterlist params;
- irc::string command;
- std::string prefix;
-
- line = line.substr(0, line.find_first_of("\r\n"));
-
- if (line.empty())
- return true;
- ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] I %s", this->GetFd(), line.c_str());
-
- this->Split(line.c_str(),params);
-
- if (params.empty())
- return true;
+ if (!tokens.GetToken(prefix))
+ return;
- if ((params[0][0] == ':') && (params.size() > 1))
+ if (prefix[0] == ':')
{
- prefix = params[0].substr(1);
+ prefix.erase(prefix.begin());
if (prefix.empty())
{
- this->SendError("BUG (?) Empty prefix recieved: " + line);
- return false;
+ this->SendError("BUG (?) Empty prefix received: " + line);
+ return;
+ }
+ if (!tokens.GetToken(command))
+ {
+ this->SendError("BUG (?) Empty command received: " + line);
+ return;
}
- command = params[1].c_str();
- params.erase(params.begin(), params.begin() + 2);
}
else
{
- command = params[0].c_str();
- params.erase(params.begin());
+ command = prefix;
+ prefix.clear();
}
+ if (command.empty())
+ this->SendError("BUG (?) Empty command received: " + line);
- switch (this->LinkState)
+ std::string param;
+ while (tokens.GetToken(param))
{
- TreeServer* Node;
+ params.push_back(param);
+ }
+}
+
+void TreeSocket::ProcessLine(std::string &line)
+{
+ std::string prefix;
+ std::string command;
+ parameterlist params;
+ ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] I %s", this->GetFd(), line.c_str());
+
+ Split(line, prefix, command, params);
+
+ if (command.empty())
+ return;
+
+ switch (this->LinkState)
+ {
case WAIT_AUTH_1:
/*
* State WAIT_AUTH_1:
}
else if (command == "SERVER")
{
- return this->Inbound_Server(params);
+ this->Inbound_Server(params);
}
else if (command == "ERROR")
{
- return this->Error(params);
+ this->Error(params);
}
else if (command == "USER")
{
this->SendError("Client connections to this port are prohibited.");
- return false;
}
else if (command == "CAPAB")
{
- return this->Capab(params);
+ this->Capab(params);
}
else
{
- this->SendError(std::string("Invalid command in negotiation phase: ") + command.c_str());
- return false;
+ this->SendError("Invalid command in negotiation phase: " + command);
}
break;
case WAIT_AUTH_2:
* Both of these aren't allowable, so block them here. -- w
*/
this->SendError("You may not re-authenticate or commence netburst without sending BURST.");
- return true;
}
else if (command == "BURST")
{
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));
- SendError("Your clocks are out by "+ConvToStr(abs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
- return false;
+ ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %ld seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",labs((long)delta));
+ SendError("Your clocks are out by "+ConvToStr(labs((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 %ld seconds. Please consider synching your clocks.", labs((long)delta));
}
}
- this->LinkState = CONNECTED;
-
- Utils->timeoutlist.erase(this);
- Link* lnk = Utils->FindLink(InboundServerName);
+ // 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;
- Node = new TreeServer(this->Utils, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false);
-
- Utils->TreeRoot->AddChild(Node);
- parameterlist sparams;
- sparams.push_back(InboundServerName);
- sparams.push_back("*");
- sparams.push_back("1");
- sparams.push_back(InboundSID);
- sparams.push_back(":"+InboundDescription);
- Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(),"SERVER",sparams,InboundServerName);
- Utils->DoOneToAllButSenderRaw(line, InboundServerName, prefix, command, params);
- Node->bursting = true;
- this->DoBurst(Node);
+ FinishAuth(capab->name, capab->sid, capab->description, capab->hidden);
}
else if (command == "ERROR")
{
- return this->Error(params);
+ this->Error(params);
}
else if (command == "CAPAB")
{
- return this->Capab(params);
+ this->Capab(params);
}
break;
if (command == "SERVER")
{
// Our credentials have been accepted, send netburst. (this puts US into the CONNECTED state)
- return this->Outbound_Reply_Server(params);
+ this->Outbound_Reply_Server(params);
}
else if (command == "ERROR")
{
- return this->Error(params);
+ this->Error(params);
}
else if (command == "CAPAB")
{
- return this->Capab(params);
+ this->Capab(params);
}
break;
case CONNECTED:
/*
- * State CONNECTED:
+ * State CONNECTED:
* Credentials have been exchanged, we've gotten their 'BURST' (or sent ours).
* Anything from here on should be accepted a little more reasonably.
*/
- if (!prefix.empty())
- {
- /*
- * Check for fake direction here, and drop any instances that are found.
- * What is fake direction? Imagine the following server setup:
- * 0AA <-> 0AB <-> 0AC
- * Fake direction would be 0AC sending a message to 0AB claiming to be from
- * 0AA, or something similar. Basically, a message taking a path that *cannot*
- * be correct.
- *
- * When would this be seen?
- * Well, hopefully never. It could be caused by race conditions, bugs, or
- * "miscreant" servers, though, so let's check anyway. -- w
- *
- * We also check here for totally invalid prefixes (prefixes that are neither
- * a valid SID or a valid UUID, so that invalid UUID or SID never makes it
- * to the higher level functions. -- B
- */
- std::string direction = prefix;
-
- User *t = ServerInstance->FindUUID(prefix);
- if (t)
- {
- /* Find UID */
- direction = t->server;
- }
- else if (!this->Utils->FindServer(direction))
- {
- /* Find SID */
- ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Protocol violation: Invalid prefix '%s' from connection '%s'", direction.c_str(), this->GetName().c_str());
- return true;
- }
-
- TreeServer* route_back_again = Utils->BestRouteTo(direction);
- if ((!route_back_again) || (route_back_again->GetSocket() != this))
- {
- if (route_back_again)
- ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str());
- return true;
- }
- }
- else
- {
- /*
- * Empty prefix from a server to server link:
- * This is somewhat bad/naughty, so let's set the prefix
- * to be the link that we got it from, so we don't break anything. -- w
- */
- TreeServer* n = Utils->FindServer(GetName());
- if (n)
- prefix = n->GetID();
- else
- prefix = GetName();
- }
-
- /*
- * First up, check for any malformed commands (e.g. MODE without a timestamp)
- * and rewrite commands where necessary (SVSMODE -> MODE for services). -- w
- */
- if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
- command = "MODE";
-
- /*
- * Now, check for (and parse) commands as appropriate. -- w
- */
-
- /* Find the server that this command originated from, used in the handlers below */
- TreeServer *ServerSource = Utils->FindServer(prefix);
- if (ServerSource)
- {
- Utils->ServerUser->SetFakeServer(ServerSource->GetName());
- Utils->ServerUser->uuid = ServerSource->GetID();
- }
+ this->ProcessConnectedLine(prefix, command, params);
+ break;
+ case DYING:
+ break;
+ }
+}
- /* Find the link we just got this from so we don't bounce it back incorrectly */
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
- {
- sourceserv = this->InboundServerName;
- }
+User* TreeSocket::FindSource(const std::string& prefix, const std::string& command)
+{
+ // Empty prefix means the source is the directly connected server that sent this command
+ if (prefix.empty())
+ return MyRoot->ServerUser;
+
+ // If the prefix string is a uuid or a sid FindUUID() returns the appropriate User object
+ User* who = ServerInstance->FindUUID(prefix);
+ if (who)
+ return who;
+
+ // Some implementations wrongly send a server name as prefix occasionally, handle that too for now
+ TreeServer* const server = Utils->FindServer(prefix);
+ if (server)
+ return server->ServerUser;
+
+ /* It is important that we don't close the link here, unknown prefix can occur
+ * 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!
+ */
+
+ 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)
+ return who;
+ return this->MyRoot->ServerUser;
+ }
- /*
- * XXX one of these days, this needs to be moved into class Commands.
- */
- if (command == "UID")
- {
- return this->ParseUID(prefix, params);
- }
- else if (command == "FJOIN")
- {
- return this->ForceJoin(prefix,params);
- }
- else if ((command == "NOTICE" || command == "PRIVMSG") && (Utils->IsServer(prefix)))
- {
- return ServerMessage(assign(command), prefix, params, sourceserv);
- }
- else if (command == "STATS")
- {
- return this->Stats(prefix, params);
- }
- else if (command == "MOTD")
- {
- return this->Motd(prefix, params);
- }
- else if (command == "KILL" && ServerSource)
- {
- // Kill from a server
- return this->RemoteKill(prefix,params);
- }
- else if (command == "MODULES")
- {
- return this->Modules(prefix, params);
- }
- else if (command == "ADMIN")
- {
- return this->Admin(prefix, params);
- }
- else if (command == "MAP")
- {
- User* user = ServerInstance->FindNick(prefix);
- if (user)
- {
- return Utils->Creator->HandleMap(params, user);
- }
- }
- else if (command == "SERVER")
- {
- return this->RemoteServer(prefix,params);
- }
- else if (command == "ERROR")
- {
- return this->Error(params);
- }
- else if (command == "OPERTYPE")
- {
- return this->OperType(prefix,params);
- }
- else if (command == "AWAY")
- {
- return this->Away(prefix,params);
- }
- else if (command == "FMODE")
- {
- return this->ForceMode(prefix,params);
- }
- else if (command == "FTOPIC")
- {
- return this->ForceTopic(prefix,params);
- }
- else if (command == "METADATA")
- {
- return this->MetaData(prefix,params);
- }
- else if (command == "PING")
- {
- return this->LocalPing(prefix,params);
- }
- else if (command == "PONG")
- {
- 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());
- s->FinishBurst();
- }
- return this->LocalPong(prefix,params);
- }
- else if (command == "VERSION")
- {
- return this->ServerVersion(prefix,params);
- }
- else if (command == "FHOST")
- {
- return this->ChangeHost(prefix,params);
- }
- else if (command == "FNAME")
- {
- return this->ChangeName(prefix,params);
- }
- else if (command == "FIDENT")
- {
- return this->ChangeIdent(prefix,params);
- }
- else if (command == "ADDLINE")
- {
- return this->AddLine(prefix,params);
- }
- else if (command == "DELLINE")
- {
- return this->DelLine(prefix,params);
- }
- else if (command == "SVSNICK")
- {
- return this->SVSNick(prefix,params);
- }
- else if (command == "SAVE")
- {
- return this->ForceNick(prefix,params);
- }
- else if (command == "OPERQUIT")
- {
- return this->OperQuit(prefix,params);
- }
- else if (command == "IDLE")
- {
- return this->Whois(prefix,params);
- }
- else if (command == "PUSH")
- {
- return this->Push(prefix,params);
- }
- else if (command == "TIME")
- {
- return this->Time(prefix,params);
- }
- else if (command == "SVSJOIN")
- {
- return this->ServiceJoin(prefix,params);
- }
- else if (command == "SVSPART")
- {
- return this->ServicePart(prefix,params);
- }
- else if (command == "SQUIT")
- {
- if (params.size() == 2)
- {
- this->Squit(Utils->FindServer(params[0]),params[1]);
- }
- return true;
- }
- else if (command == "MODENOTICE")
- {
- if (params.size() >= 2)
- {
- if (ServerSource)
- ServerInstance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()), params[1].c_str());
- }
- return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
- }
- else if (command == "SNONOTICE")
- {
- if (params.size() >= 2)
- {
- std::string oldprefix;
- if (!ServerSource)
- {
- oldprefix = prefix;
- User *u = ServerInstance->FindNick(prefix);
- if (!u)
- return true;
- prefix = u->nick;
- }
+ // Unknown prefix
+ return NULL;
+}
- ServerInstance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
- prefix = oldprefix;
- return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
- }
+void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, parameterlist& params)
+{
+ User* who = FindSource(prefix, command);
+ if (!who)
+ {
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Command '%s' from unknown prefix '%s'! Dropping entire command.", command.c_str(), prefix.c_str());
+ return;
+ }
- }
- else if (command == "BURST")
- {
- // Set prefix server as bursting
- if (!ServerSource)
- {
- ServerInstance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
- return false;
- }
+ /*
+ * Check for fake direction here, and drop any instances that are found.
+ * What is fake direction? Imagine the following server setup:
+ * 0AA <-> 0AB <-> 0AC
+ * Fake direction would be 0AC sending a message to 0AB claiming to be from
+ * 0AA, or something similar. Basically, a message taking a path that *cannot*
+ * be correct.
+ *
+ * When would this be seen?
+ * Well, hopefully never. It could be caused by race conditions, bugs, or
+ * "miscreant" servers, though, so let's check anyway. -- w
+ *
+ * We also check here for totally invalid prefixes (prefixes that are neither
+ * a valid SID or a valid UUID, so that invalid UUID or SID never makes it
+ * to the higher level functions. -- B
+ */
+ TreeServer* const server = TreeServer::Get(who);
+ if (server->GetSocket() != this)
+ {
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Protocol violation: Fake direction '%s' from connection '%s'", prefix.c_str(), linkID.c_str());
+ return;
+ }
- ServerSource->bursting = true;
- return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
- }
- else if (command == "ENDBURST")
- {
- if (!ServerSource)
- {
- ServerInstance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
- return false;
- }
+ // Translate commands coming from servers using an older protocol
+ if (proto_version < ProtocolVersion)
+ {
+ if (!PreProcessOldProtocolMessage(who, command, params))
+ return;
+ }
- ServerSource->FinishBurst();
- return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
- }
- else if (command == "ENCAP")
+ ServerCommand* scmd = Utils->Creator->CmdManager.GetHandler(command);
+ CommandBase* cmdbase = scmd;
+ Command* cmd = NULL;
+ if (!scmd)
+ {
+ // Not a special server-to-server command
+ cmd = ServerInstance->Parser.GetHandler(command);
+ if (!cmd)
+ {
+ if (command == "ERROR")
{
- return this->Encap(prefix, params);
+ this->Error(params);
+ return;
}
- else
- {
- /*
- * Not a special s2s command. Emulate the user doing it.
- * This saves us having a huge ugly command parser again.
- */
- User* who = ServerInstance->FindUUID(prefix);
-
- if (ServerSource)
- {
- who = Utils->ServerUser;
- }
- else if (!who)
- {
- /* this looks ugly because command is an irc::string
- * It is important that we dont close the link here, unknown prefix can occur
- * 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 " + std::string(command.c_str()) + " from unknown prefix " + prefix + "! Dropping entire command.");
- return true;
- }
-
- if (command == "NICK")
- {
- if (params.size() != 2)
- {
- SendError("Protocol violation: NICK message without TS - :"+std::string(who->uuid)+" NICK "+params[0]);
- return false;
- }
- /* Update timestamp on user when they change nicks */
- who->age = atoi(params[1].c_str());
-
- /*
- * On nick messages, check that the nick doesnt already exist here.
- * If it does, perform collision logic.
- */
- User* x = ServerInstance->FindNickOnly(params[0]);
- if ((x) && (x != who))
- {
- int collideret = 0;
- /* x is local, who is remote */
- collideret = this->DoCollision(x, who->age, who->ident, who->GetIPString(), who->uuid);
- if (collideret != 1)
- {
- /*
- * Remote client lost, or both lost, parsing or passing on this
- * nickchange would be pointless, as the incoming client's server will
- * soon recieve SVSNICK to change its nick to its UID. :) -- w00t
- */
- return true;
- }
- }
- }
- switch (ServerInstance->CallCommandHandler(command.c_str(), params, who))
- {
- case CMD_INVALID:
- /*
- * XXX: command is irc::string, hence ugliness
- */
- this->SendError("Unrecognised or malformed command '" + std::string(command.c_str()) + "' -- possibly loaded mismatched modules");
- return false;
- break;
- case CMD_FAILURE:
- /*
- * CMD_LOCALONLY is aliased to CMD_FAILURE, so this won't go out onto the network.
- */
- return true;
- break;
- default:
- /* CMD_SUCCESS falls through here */
- break;
- }
+ throw ProtocolException("Unknown command");
+ }
+ cmdbase = cmd;
+ }
- return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
+ if (params.size() < cmdbase->min_params)
+ throw ProtocolException("Insufficient parameters");
- }
- return true;
- break; // end of state CONNECTED (phew).
+ if ((!params.empty()) && (params.back().empty()) && (!cmdbase->allow_empty_last_param))
+ {
+ // 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 < cmdbase->min_params)
+ return;
+ params.pop_back();
}
- return true;
-}
-std::string TreeSocket::GetName()
-{
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
+ CmdResult res;
+ if (scmd)
+ res = scmd->Handle(who, params);
+ else
{
- sourceserv = this->InboundServerName;
+ res = cmd->Handle(params, who);
+ if (res == CMD_INVALID)
+ throw ProtocolException("Error in command handler");
}
- return sourceserv;
+
+ if (res == CMD_SUCCESS)
+ Utils->RouteCommand(server->GetRoute(), cmdbase, params, who);
}
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()
{
- this->BufferedSocket::Close();
-
- // Test fix for big fuckup
- if (this->LinkState != CONNECTED)
+ if (fd < 0)
return;
+ ServerInstance->GlobalCulls.AddItem(this);
+ this->BufferedSocket::Close();
+ 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)
+ if (MyRoot)
+ MyRoot->SQuit(getError());
+
+ ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str());
+
+ time_t server_uptime = ServerInstance->Time() - this->age;
+ if (server_uptime)
{
- Squit(s,"Remote host closed the connection");
+ std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime);
+ ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str());
}
+}
- if (!quitserver.empty())
- {
- ServerInstance->SNO->WriteToSnoMask('l', "Connection to '\2%s\2' failed.",quitserver.c_str());
+void TreeSocket::FinishAuth(const std::string& remotename, const std::string& remotesid, const std::string& remotedesc, bool hidden)
+{
+ this->LinkState = CONNECTED;
+ Utils->timeoutlist.erase(this);
- 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());
- }
+ linkID = remotename;
+
+ MyRoot = new TreeServer(remotename, remotedesc, remotesid, Utils->TreeRoot, this, hidden);
+
+ // Mark the server as bursting
+ MyRoot->BeginBurst();
+ this->DoBurst(MyRoot);
+
+ CommandServer::Builder(MyRoot).Forward(MyRoot);
}
projects / user / henk / code / inspircd.git / blobdiff