X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=c9729cc0f3a6837c96d3d290b1e44c0ad8e9887b;hb=4e24fb7c19cff866eda602349fbafce78b7e4c51;hp=23d1e46cdfa01b8afbf7586cc62e14f1265ea9f0;hpb=c7c29d03e204473f82cdf2f33f8d24b83b61ed63;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 23d1e46cd..c9729cc0f 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-2010 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,27 +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; + 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()) { - ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, hook); + ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, link->Hook); if (!prov) { - SetError("Could not find hook '" + hook + "' for connection to " + ServerName); + SetError("Could not find hook '" + link->Hook + "' for connection to " + linkID); return; } AddIOHook(prov->creator); } - 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); } @@ -62,19 +74,20 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via : BufferedSocket(newfd), Utils(Util) { capab = new CapabData; - IP = client->addr(); + capab->capab_phase = 0; + MyRoot = NULL; age = ServerInstance->Time(); LinkState = WAIT_AUTH_1; - capab->capab_phase = 0; proto_version = 0; - myhost = "inbound from " + IP; + ConnectionFailureShown = false; + linkID = "inbound from " + client->addr(); FOREACH_MOD(I_OnHookIO, OnHookIO(this, via)); if (GetIOHook()) GetIOHook()->OnStreamSocketAccept(this, client, server); SendCapabilities(1); - Utils->timeoutlist[this] = std::pair(myhost, 30); + Utils->timeoutlist[this] = std::pair(linkID, 30); } ServerState TreeSocket::GetLinkState() @@ -84,6 +97,9 @@ ServerState TreeSocket::GetLinkState() void TreeSocket::CleanNegotiationInfo() { + // connect is good, reset the autoconnect block (if used) + if (capab->ac) + capab->ac->position = -1; delete capab; capab = NULL; } @@ -91,8 +107,8 @@ void TreeSocket::CleanNegotiationInfo() 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(); } @@ -112,37 +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->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", myhost.c_str(), (x->HiddenFromStats ? "" : this->IP.c_str())); - capab->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->WriteGlobalSno('l', "Connection to \2%s\2 lost link tag(!)", myhost.c_str()); } void TreeSocket::OnError(BufferedSocketError e) { - ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002 failed with error: %s", - myhost.c_str(), getError().c_str()); - ServerInstance->GlobalCulls.AddItem(this); + 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) { WriteLine("ERROR :"+errormessage); + DoWrite(); + LinkState = DYING; SetError(errormessage); } @@ -152,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 ;) @@ -163,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++; @@ -182,10 +186,14 @@ 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->GetID()); + params.push_back(":"+reason); + Utils->DoOneToAllButSender(Current->GetParent()->GetID(),"SQUIT",params,Current->GetID()); + } + if (Current->GetParent() == Utils->TreeRoot) { ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason); @@ -193,20 +201,24 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason) } else { - ServerInstance->SNO->WriteGlobalSno('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason); + 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 user%s on \002%d\002 server%s.", num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : ""); - else - ServerInstance->SNO->WriteToSnoMask('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" : ""); + if (ismyroot) + { + MyRoot = NULL; + Close(); + } } else ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server"); @@ -233,7 +245,12 @@ void TreeSocket::OnDataReady() if (!getError().empty()) break; } - if (getError().empty() && recvq.length() > 4096) + if (LinkState != CONNECTED && recvq.length() > 4096) SendError("RecvQ overrun (line too long)"); Utils->Creator->loopCall = false; } + +bool TreeSocket::Introduced() +{ + return (capab == NULL); +}