-/* +------------------------------------+
- * | 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) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ * 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 "../m_hash.h"
#include "socketengine.h"
#include "main.h"
+#include "../spanningtree.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_hash.h m_spanningtree/handshaketimer.h */
-
/** Because most of the I/O gubbins are encapsulated within
* BufferedSocket, we just call the superclass constructor for
* most of the action, and append a few of our own values
* to it.
*/
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, std::string shost, int iport, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Autoconnect* myac, Module* HookMod)
- : Utils(Util), IP(shost), myautoconnect(myac)
+TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* myac, const std::string& ipaddr)
+ : Utils(Util)
{
age = ServerInstance->Time();
- myhost = ServerName;
- capab_phase = 0;
+ linkID = assign(link->Name);
+ capab = new CapabData;
+ capab->link = link;
+ capab->ac = myac;
+ capab->capab_phase = 0;
+ MyRoot = NULL;
proto_version = 0;
+ ConnectionFailureShown = false;
LinkState = CONNECTING;
- DoConnect(shost, iport, maxtime, bindto);
- Utils->timeoutlist[this] = std::pair<std::string, int>(ServerName, maxtime);
- if (HookMod)
- BufferedSocketHookRequest(this, Utils->Creator, HookMod).Send();
- hstimer = NULL;
+ if (!link->Hook.empty())
+ {
+ ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, link->Hook);
+ if (!prov)
+ {
+ SetError("Could not find hook '" + link->Hook + "' for connection to " + linkID);
+ return;
+ }
+ AddIOHook(prov->creator);
+ }
+ DoConnect(ipaddr, link->Port, link->Timeout, link->Bind);
+ Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, link->Timeout);
+ SendCapabilities(1);
}
/** When a listening socket gives us a new file descriptor,
* we must associate it with a socket without creating a new
* connection. This constructor is used for this purpose.
*/
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, char* ip, Autoconnect* myac, Module* HookMod)
- : BufferedSocket(newfd), Utils(Util), IP(ip), myautoconnect(myac)
+TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+ : BufferedSocket(newfd), Utils(Util)
{
+ capab = new CapabData;
+ capab->capab_phase = 0;
+ MyRoot = NULL;
age = ServerInstance->Time();
LinkState = WAIT_AUTH_1;
- capab_phase = 0;
proto_version = 0;
- /* If we have a transport module hooked to the parent, hook the same module to this
- * socket, and set a timer waiting for handshake before we send CAPAB etc.
- */
- if (HookMod)
- BufferedSocketHookRequest(this, Utils->Creator, HookMod).Send();
+ ConnectionFailureShown = false;
+ linkID = "inbound from " + client->addr();
- hstimer = new HandshakeTimer(this, Utils->LinkBlocks[0], this->Utils, 1);
- ServerInstance->Timers->AddTimer(hstimer);
+ FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+ if (GetIOHook())
+ GetIOHook()->OnStreamSocketAccept(this, client, server);
+ SendCapabilities(1);
- /* Fix by Brain - inbound sockets need a timeout, too. 30 secs should be pleanty */
- Utils->timeoutlist[this] = std::pair<std::string, int>("<from " + std::string(ip) + ">", 30);
+ Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, 30);
}
ServerState TreeSocket::GetLinkState()
void TreeSocket::CleanNegotiationInfo()
{
- ModuleList.clear();
- OptModuleList.clear();
- CapKeys.clear();
- ourchallenge.clear();
- theirchallenge.clear();
- OutboundPass.clear();
+ // connect is good, reset the autoconnect block (if used)
+ if (capab->ac)
+ capab->ac->position = -1;
+ delete capab;
+ capab = NULL;
}
-bool TreeSocket::cull()
+CullResult TreeSocket::cull()
{
- if (GetIOHook())
- BufferedSocketUnhookRequest(this, Utils->Creator, GetIOHook()).Send();
Utils->timeoutlist.erase(this);
+ if (capab && capab->ac)
+ Utils->Creator->ConnectServer(capab->ac, false);
return this->BufferedSocket::cull();
}
TreeSocket::~TreeSocket()
{
- if (hstimer)
- ServerInstance->Timers->DelTimer(hstimer);
+ if (capab)
+ delete capab;
}
/** When an outbound connection finishes connecting, we receive
{
if (this->LinkState == CONNECTING)
{
- /* we do not need to change state here. */
- for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); ++i)
- {
- Link* x = *i;
- if (x->Name == this->myhost)
- {
- ServerInstance->SNO->WriteToSnoMask('l', "Connection to \2%s\2[%s] started.", myhost.c_str(), (x->HiddenFromStats ? "<hidden>" : this->IP.c_str()));
- this->OutboundPass = x->SendPass;
- if (GetIOHook())
- {
- ServerInstance->SNO->WriteToSnoMask('l', "Connection to \2%s\2[%s] using transport \2%s\2", myhost.c_str(), (x->HiddenFromStats ? "<hidden>" : this->IP.c_str()), x->Hook.c_str());
- hstimer = new HandshakeTimer(this, &(*x), this->Utils, 1);
- ServerInstance->Timers->AddTimer(hstimer);
- }
- else
- this->SendCapabilities(1);
- return;
- }
- }
+ ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(),
+ (capab->link->HiddenFromStats ? "<hidden>" : capab->link->IPAddr.c_str()));
+ this->SendCapabilities(1);
}
- /* There is a (remote) chance that between the /CONNECT and the connection
- * being accepted, some muppet has removed the <link> block and rehashed.
- * If that happens the connection hangs here until it's closed. Unlikely
- * and rather harmless.
- */
- ServerInstance->SNO->WriteToSnoMask('l', "Connection to \2%s\2 lost link tag(!)", myhost.c_str());
}
void TreeSocket::OnError(BufferedSocketError e)
{
- switch (e)
- {
- case I_ERR_CONNECT:
- ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Connection to \002%s\002 refused", myhost.c_str());
- Utils->Creator->ConnectServer(myautoconnect);
- break;
- case I_ERR_SOCKET:
- ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Could not create socket (%s)", strerror(errno));
- break;
- case I_ERR_BIND:
- ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Error binding socket to address or port (%s)", strerror(errno));
- break;
- case I_ERR_WRITE:
- ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: I/O error on connection (%s)", errno ? strerror(errno) : "Connection closed unexpectedly");
- break;
- case I_ERR_NOMOREFDS:
- ServerInstance->SNO->WriteToSnoMask('l', "Connection failed: Operating system is out of file descriptors!");
- break;
- default:
- if ((errno) && (errno != EINPROGRESS) && (errno != EAGAIN))
- ServerInstance->SNO->WriteToSnoMask('l', "Connection to \002%s\002 failed with OS error: %s", myhost.c_str(), strerror(errno));
- break;
- }
+ ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed with error: %s",
+ linkID.c_str(), getError().c_str());
+ LinkState = DYING;
}
void TreeSocket::SendError(const std::string &errormessage)
{
- /* Display the error locally as well as sending it remotely */
- ServerInstance->SNO->WriteToSnoMask('l', "Sent \2ERROR\2 to %s: %s", (this->InboundServerName.empty() ? this->IP.c_str() : this->InboundServerName.c_str()), errormessage.c_str());
WriteLine("ERROR :"+errormessage);
+ DoWrite();
+ LinkState = DYING;
SetError(errormessage);
}
* is having a REAL bad hair day, this function shouldnt be called
* too many times a month ;-)
*/
-void TreeSocket::SquitServer(std::string &from, TreeServer* Current)
+void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users)
{
+ std::string servername = Current->GetName();
ServerInstance->Logs->Log("m_spanningtree",DEBUG,"SquitServer for %s from %s",
- Current->GetName().c_str(), from.c_str());
+ servername.c_str(), from.c_str());
/* recursively squit the servers attached to 'Current'.
* We're going backwards so we don't remove users
* while we still need them ;)
for (unsigned int q = 0; q < Current->ChildCount(); q++)
{
TreeServer* recursive_server = Current->GetChild(q);
- this->SquitServer(from,recursive_server);
+ this->SquitServer(from,recursive_server, num_lost_servers, num_lost_users);
}
/* Now we've whacked the kids, whack self */
num_lost_servers++;
if ((Current) && (Current != Utils->TreeRoot))
{
- Event rmode((char*)Current->GetName().c_str(), (Module*)Utils->Creator, "lost_server");
- rmode.Send();
+ DelServerEvent(Utils->Creator, Current->GetName());
+
+ if (!Current->GetSocket() || Current->GetSocket()->Introduced())
+ {
+ parameterlist params;
+ params.push_back(Current->GetID());
+ params.push_back(":"+reason);
+ Utils->DoOneToAllButSender(Current->GetParent()->GetID(),"SQUIT",params,Current->GetID());
+ }
- parameterlist params;
- params.push_back(Current->GetName());
- params.push_back(":"+reason);
- Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());
if (Current->GetParent() == Utils->TreeRoot)
{
- ServerInstance->SNO->WriteToSnoMask('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
+ ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
LocalSquit = true;
}
else
{
ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
}
- num_lost_servers = 0;
- num_lost_users = 0;
+ int num_lost_servers = 0;
+ int num_lost_users = 0;
std::string from = Current->GetParent()->GetName()+" "+Current->GetName();
- SquitServer(from, Current);
+ SquitServer(from, Current, num_lost_servers, num_lost_users);
+ ServerInstance->SNO->WriteToSnoMask(LocalSquit ? 'l' : 'L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.",
+ num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
Current->Tidy();
Current->GetParent()->DelChild(Current);
+ Current->cull();
+ const bool ismyroot = (Current == MyRoot);
delete Current;
- if (LocalSquit)
- ServerInstance->SNO->WriteToSnoMask('l', "Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
- else
- ServerInstance->SNO->WriteToSnoMask('L', "Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
+ if (ismyroot)
+ {
+ MyRoot = NULL;
+ Close();
+ }
}
else
ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server");
void TreeSocket::OnDataReady()
{
Utils->Creator->loopCall = true;
- /* While there is at least one new line in the buffer,
- * do something useful (we hope!) with it.
- */
- while (recvq.find("\n") != std::string::npos)
+ std::string line;
+ while (GetNextLine(line))
{
- std::string ret = recvq.substr(0,recvq.find("\n")-1);
- recvq = recvq.substr(recvq.find("\n")+1,recvq.length()-recvq.find("\n"));
- /* Use rfind here not find, as theres more
- * chance of the \r being near the end of the
- * string, not the start.
- */
- if (ret.find("\r") != std::string::npos)
- ret = recvq.substr(0,recvq.find("\r")-1);
- ProcessLine(ret);
+ std::string::size_type rline = line.find('\r');
+ if (rline != std::string::npos)
+ line = line.substr(0,rline);
+ if (line.find('\0') != std::string::npos)
+ {
+ SendError("Read null character from socket");
+ break;
+ }
+ ProcessLine(line);
+ if (!getError().empty())
+ break;
}
+ if (LinkState != CONNECTED && recvq.length() > 4096)
+ SendError("RecvQ overrun (line too long)");
Utils->Creator->loopCall = false;
}
+
+bool TreeSocket::Introduced()
+{
+ return (capab == NULL);
+}
projects / user / henk / code / inspircd.git / blobdiff