X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket2.cpp;h=bc9388c94956287c8a6f94e7716be03525d0bb6f;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=3d4f70c5ea0c2a3d2fe966cf4c24d10e89b69b18;hpb=80c42b2f461c661a378b1eed0350b0fdbdd19889;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 3d4f70c5e..bc9388c94 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -15,40 +15,39 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" -#include "wildcard.h" #include "xline.h" -#include "transport.h" +#include "../transport.h" #include "socketengine.h" -#include "m_spanningtree/main.h" -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/link.h" -#include "m_spanningtree/treesocket.h" -#include "m_spanningtree/resolvers.h" -#include "m_spanningtree/handshaketimer.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/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.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 */ void TreeSocket::WriteLine(std::string line) { - Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str()); + ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str()); line.append("\r\n"); this->Write(line); } /* Handle ERROR command */ -bool TreeSocket::Error(std::deque ¶ms) +bool TreeSocket::Error(parameterlist ¶ms) { if (params.size() < 1) return false; - this->Instance->SNO->WriteToSnoMask('l',"ERROR from %s: %s",(!InboundServerName.empty() ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str()); + this->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; } -void TreeSocket::Split(const std::string &line, std::deque &n) +void TreeSocket::Split(const std::string &line, parameterlist &n) { n.clear(); irc::tokenstream tokens(line); @@ -62,7 +61,7 @@ void TreeSocket::Split(const std::string &line, std::deque &n) bool TreeSocket::ProcessLine(std::string &line) { - std::deque params; + parameterlist params; irc::string command; std::string prefix; @@ -71,27 +70,30 @@ bool TreeSocket::ProcessLine(std::string &line) if (line.empty()) return true; - Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] I %s", this->GetFd(), line.c_str()); + 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 ((params[0][0] == ':') && (params.size() > 1)) { prefix = params[0].substr(1); - params.pop_front(); - + if (prefix.empty()) { - this->SendError("BUG (?) Empty prefix recieved."); + this->SendError("BUG (?) Empty prefix recieved: " + line); return false; } + command = params[1].c_str(); + params.erase(params.begin(), params.begin() + 2); + } + else + { + command = params[0].c_str(); + params.erase(params.begin()); } - - command = params[0].c_str(); - params.pop_front(); switch (this->LinkState) { @@ -161,38 +163,35 @@ bool TreeSocket::ProcessLine(std::string &line) if (params.size()) { time_t them = atoi(params[0].c_str()); - time_t delta = them - Instance->Time(); + time_t delta = them - ServerInstance->Time(); if ((delta < -600) || (delta > 600)) { - Instance->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(delta)); - SendError("Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!"); + 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; } else if ((delta < -30) || (delta > 30)) { - Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs(delta)); + ServerInstance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta)); } } this->LinkState = CONNECTED; - Link* lnk = Utils->FindLink(InboundServerName); - Node = new TreeServer(this->Utils, this->Instance, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false); + Utils->timeoutlist.erase(this); - if (Node->DuplicateID()) - { - this->SendError("Server ID "+InboundSID+" already exists on the network!"); - this->Instance->SNO->WriteToSnoMask('l',"Server \2"+InboundServerName+"\2 being introduced from \2" + prefix + "\2 denied, server ID already exists on the network. Closing link."); - return false; - } + Link* lnk = Utils->FindLink(InboundServerName); + + Node = new TreeServer(this->Utils, this->ServerInstance, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false); Utils->TreeRoot->AddChild(Node); - params.clear(); - params.push_back(InboundServerName); - params.push_back("*"); - params.push_back("1"); - params.push_back(InboundSID); - params.push_back(":"+InboundDescription); - Utils->DoOneToAllButSender(Instance->Config->GetSID(),"SERVER",params,InboundServerName); + 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); } @@ -206,13 +205,6 @@ bool TreeSocket::ProcessLine(std::string &line) } break; - case LISTENER: - /* - * This really shouldn't happen. - */ - this->SendError("Internal error -- listening socket accepted its own descriptor!!!"); - return false; - break; case CONNECTING: /* * State CONNECTING: @@ -253,28 +245,33 @@ bool TreeSocket::ProcessLine(std::string &line) * 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 = this->Instance->FindUUID(prefix); + User *t = this->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) - Instance->Logs->Log("m_spanningtree",DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str()); + 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; } - /* Fix by brain: - * When there is activity on the socket, reset the ping counter so - * that we're not wasting bandwidth pinging an active server. - */ - route_back_again->SetNextPingTime(Instance->Time() + Utils->PingFreq); - route_back_again->SetPingFlag(); } else { @@ -297,26 +294,17 @@ bool TreeSocket::ProcessLine(std::string &line) if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels. command = "MODE"; - if (command == "MODE") - { - if (params.size() >= 2) - { - Channel* channel = Instance->FindChan(params[0]); - if (channel) - { - this->SendError("MODE may no longer be used on channels. Please use FMODE, with correct timestamp rules."); - return false; - } - } - } - - /* * 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(); + } /* Find the link we just got this from so we don't bounce it back incorrectly */ std::string sourceserv = this->myhost; @@ -363,13 +351,11 @@ bool TreeSocket::ProcessLine(std::string &line) } else if (command == "MAP") { - User* user = Instance->FindNick(prefix); + User* user = ServerInstance->FindNick(prefix); if (user) { - const char* ptrs[127]; - for (size_t n = 0; (n < params.size()) && (n < 127); ++n) - ptrs[n] = params[n].c_str(); - return Utils->Creator->HandleMap(ptrs, params.size(), user); + std::vector p(params.begin(), params.end()); + return Utils->Creator->HandleMap(p, user); } } else if (command == "SERVER") @@ -402,6 +388,12 @@ bool TreeSocket::ProcessLine(std::string &line) } 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") @@ -444,23 +436,6 @@ bool TreeSocket::ProcessLine(std::string &line) { return this->Time(prefix,params); } - else if ((command == "KICK") && (Utils->IsServer(prefix))) - { - if (params.size() == 3) - { - TreeServer* pf = Utils->FindServer(prefix); - User* user = this->Instance->FindNick(params[1]); - Channel* chan = this->Instance->FindChan(params[0]); - if (pf && user && chan) - { - if (!chan->ServerKickUser(user, params[2].c_str(), false, pf->GetName().c_str())) - /* Yikes, the channels gone! */ - delete chan; - } - } - - return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); - } else if (command == "SVSJOIN") { return this->ServiceJoin(prefix,params); @@ -477,18 +452,12 @@ bool TreeSocket::ProcessLine(std::string &line) } return true; } - else if (command == "OPERNOTICE") - { - if (params.size() >= 1) - Instance->SNO->WriteToSnoMask('A', "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": " + params[0]); - return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params); - } else if (command == "MODENOTICE") { if (params.size() >= 2) { if (ServerSource) - Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()), params[1].c_str()); + 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); } @@ -496,19 +465,31 @@ bool TreeSocket::ProcessLine(std::string &line) { if (params.size() >= 2) { - Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]); + std::string oldprefix; + if (!ServerSource) + { + oldprefix = prefix; + User *u = ServerInstance->FindNick(prefix); + if (!u) + return true; + prefix = u->nick; + } + + 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); } - return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params); + } else if (command == "BURST") { // Set prefix server as bursting if (!ServerSource) { - this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str())); + this->ServerInstance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str())); return false; } - + ServerSource->bursting = true; return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params); } @@ -516,10 +497,10 @@ bool TreeSocket::ProcessLine(std::string &line) { if (!ServerSource) { - this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str())); + this->ServerInstance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str())); return false; } - + ServerSource->FinishBurst(); return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params); } @@ -527,42 +508,27 @@ bool TreeSocket::ProcessLine(std::string &line) { return this->Encap(prefix, params); } - else if (command == "MODE") - { - // Server-prefix MODE. - const char* modelist[MAXPARAMETERS]; - for (size_t i = 0; i < params.size(); i++) - modelist[i] = params[i].c_str(); - - /* We don't support this for channel mode changes any more! */ - if (params.size() >= 1) - { - if (Instance->FindChan(params[0])) - { - this->SendError("Protocol violation by '"+(ServerSource ? ServerSource->GetName().c_str() : prefix)+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps."); - return false; - } - } - - // Insert into the parser - this->Instance->SendMode(modelist, params.size(), this->Instance->FakeClient); - - // Pass out to the network - return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); - } else { /* * Not a special s2s command. Emulate the user doing it. * This saves us having a huge ugly command parser again. */ - User *who = this->Instance->FindUUID(prefix); + User* who = this->ServerInstance->FindUUID(prefix); - if (!who) + if (ServerSource) { - // this looks ugly because command is an irc::string - this->SendError("Command (" + std::string(command.c_str()) + ") from unknown prefix (" + prefix + ")! Dropping link."); - return false; + 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") @@ -579,7 +545,7 @@ bool TreeSocket::ProcessLine(std::string &line) * On nick messages, check that the nick doesnt already exist here. * If it does, perform collision logic. */ - User* x = this->Instance->FindNickOnly(params[0]); + User* x = this->ServerInstance->FindNickOnly(params[0]); if ((x) && (x != who)) { int collideret = 0; @@ -588,23 +554,19 @@ bool TreeSocket::ProcessLine(std::string &line) if (collideret != 1) { /* - * Remote client lost, or both lost, parsing this nickchange would be - * pointless, as the incoming client's server will soon recieve SVSNICK to - * change its nick to its UID. :) -- w00t + * 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; } } } - - // its a user - const char* strparams[127]; - for (unsigned int q = 0; q < params.size(); q++) - { - strparams[q] = params[q].c_str(); - } - switch (this->Instance->CallCommandHandler(command.c_str(), strparams, params.size(), who)) + // it's a user + std::vector strparams(params.begin(), params.end()); + + switch (this->ServerInstance->CallCommandHandler(command.c_str(), strparams, who)) { case CMD_INVALID: /* @@ -647,7 +609,7 @@ void TreeSocket::OnTimeout() { if (this->LinkState == CONNECTING) { - Utils->Creator->RemoteMessage(NULL, "CONNECT: Connection to \002%s\002 timed out.", myhost.c_str()); + this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Connection to \002%s\002 timed out.", myhost.c_str()); Link* MyLink = Utils->FindLink(myhost); if (MyLink) Utils->DoFailOver(MyLink); @@ -676,38 +638,10 @@ void TreeSocket::OnClose() if (!quitserver.empty()) { - Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' failed.",quitserver.c_str()); - time_t server_uptime = Instance->Time() - this->age; - if (server_uptime) - Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' was established for %s", quitserver.c_str(), Utils->Creator->TimeToStr(server_uptime).c_str()); - } -} - -int TreeSocket::OnIncomingConnection(int newsock, char* ip) -{ - bool found = false; - - found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), ip) != Utils->ValidIPs.end()); - if (!found) - { - for (std::vector::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++) - { - if ((*i) == "*" || irc::sockets::MatchCIDR(ip, (*i).c_str())) - { - found = true; - break; - } - } + this->ServerInstance->SNO->WriteToSnoMask('l', "Connection to '\2%s\2' failed.",quitserver.c_str()); - if (!found) - { - Utils->Creator->RemoteMessage(NULL,"Server connection from %s denied (no link blocks with that IP address)", ip); - Instance->SE->Close(newsock); - return false; - } + time_t server_uptime = ServerInstance->Time() - this->age; + if (server_uptime) + this->ServerInstance->SNO->WriteToSnoMask('l', "Connection to '\2%s\2' was established for %s", quitserver.c_str(), Utils->Creator->TimeToStr(server_uptime).c_str()); } - - TreeSocket* s = new TreeSocket(this->Utils, this->Instance, newsock, ip, this->Hook); - s = s; /* Whinge whinge whinge, thats all GCC ever does. */ - return true; }