X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=6582ba0606d599ab18e2e30aafdd16342c861630;hb=fd655fa93a00a5f2993adb7ef562b6dbab8aa87c;hp=d99d8d6c9d55021faae8bd54e112623a63194a50;hpb=5815ca219e35cf840043e36db960ee7b7058e0c6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index d99d8d6c9..6582ba060 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -1,20 +1,28 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Craig Edwards + * Copyright (C) 2007 Dennis Friis * - * 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 . */ + #include "inspircd.h" #include "socket.h" #include "xline.h" -#include "../m_hash.h" #include "socketengine.h" #include "main.h" @@ -30,38 +38,31 @@ * most of the action, and append a few of our own values * to it. */ -TreeSocket::TreeSocket(SpanningTreeUtilities* Util, const std::string& shost, int iport, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Autoconnect* myac, const std::string& hook) - : 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; - if (!hook.empty()) + if (!link->Hook.empty()) { - modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook"); - if (ml) + ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, link->Hook); + if (!prov) { - for(modulelist::iterator i = ml->begin(); i != ml->end(); ++i) - { - std::string name = (**i).ModuleSourceFile; - int a = name.rfind('_'); - int b = name.rfind('.'); - name = name.substr(a+1, b-a-1); - if (name == hook) - { - AddIOHook(*i); - goto found; - } - } + SetError("Could not find hook '" + link->Hook + "' for connection to " + linkID); + return; } - SetError("Could not find hook '" + hook + "' for connection to " + ServerName); - return; + AddIOHook(prov->creator); } -found: - DoConnect(shost, iport, maxtime, bindto); - Utils->timeoutlist[this] = std::pair(ServerName, maxtime); + DoConnect(ipaddr, link->Port, link->Timeout, link->Bind); + Utils->timeoutlist[this] = std::pair(linkID, link->Timeout); SendCapabilities(1); } @@ -69,23 +70,24 @@ found: * 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, ListenSocketBase* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) +TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) : BufferedSocket(newfd), Utils(Util) { - int dummy; - irc::sockets::satoap(client, IP, dummy); + capab = new CapabData; + capab->capab_phase = 0; + MyRoot = NULL; age = ServerInstance->Time(); LinkState = WAIT_AUTH_1; - capab_phase = 0; proto_version = 0; + ConnectionFailureShown = false; + linkID = "inbound from " + client->addr(); 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("", 30); + Utils->timeoutlist[this] = std::pair(linkID, 30); } ServerState TreeSocket::GetLinkState() @@ -95,24 +97,25 @@ 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() { Utils->timeoutlist.erase(this); - if (myautoconnect) - Utils->Creator->ConnectServer(myautoconnect, false); + if (capab && capab->ac) + Utils->Creator->ConnectServer(capab->ac, false); return this->BufferedSocket::cull(); } TreeSocket::~TreeSocket() { + if (capab) + delete capab; } /** When an outbound connection finishes connecting, we receive @@ -125,58 +128,24 @@ void TreeSocket::OnConnected() { if (this->LinkState == CONNECTING) { - /* we do not need to change state here. */ - for (std::vector >::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 ? "" : this->IP.c_str())); - this->OutboundPass = x->SendPass; - this->SendCapabilities(1); - return; - } - } + ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(), + (capab->link->HiddenFromStats ? "" : 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 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()); - 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); } @@ -186,10 +155,11 @@ void TreeSocket::SendError(const std::string &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 ;) @@ -197,7 +167,7 @@ void TreeSocket::SquitServer(std::string &from, TreeServer* Current) 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++; @@ -216,30 +186,38 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason) { DelServerEvent(Utils->Creator, Current->GetName()); - parameterlist params; - params.push_back(Current->GetName()); - params.push_back(":"+reason); - Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName()); + if (!Current->GetSocket() || Current->GetSocket()->Introduced()) + { + 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); + ServerInstance->SNO->WriteGlobalSno('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(); 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 (Current == MyRoot) + { + MyRoot = NULL; + Close(); + } } else ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server"); @@ -251,20 +229,27 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason) 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); +}