X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=efcce5f7a3e46463eb71eb061d0c525f06da7a1d;hb=18ecf9d7e4056c4de789064508074266208e678f;hp=63b27cecf99982e811b7edd710e8c283c66c18bc;hpb=743f76d23f16609779ff94e70910a22be287966b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index 63b27cecf..efcce5f7a 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -1,19 +1,33 @@ -#ifndef __TREESOCKET_H__ -#define __TREESOCKET_H__ - -#include "configreader.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards + * + * 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 . + */ + + +#ifndef M_SPANNINGTREE_TREESOCKET_H +#define M_SPANNINGTREE_TREESOCKET_H + #include "socket.h" #include "inspircd.h" -#include "wildcard.h" #include "xline.h" -#include "transport.h" -#include "m_spanningtree/utils.h" +#include "utils.h" /* * The server list in InspIRCd is maintained as two structures @@ -35,85 +49,133 @@ * to apply an operation to a server, and any of its child objects * we can resort to recursion to walk the tree structure. * Any socket can have one of five states at any one time. - * The LISTENER state indicates a socket which is listening - * for connections. It cannot receive data itself, only incoming - * sockets. - * The CONNECTING state indicates an outbound socket which is - * waiting to be writeable. - * The WAIT_AUTH_1 state indicates the socket is outbound and - * has successfully connected, but has not yet sent and received - * SERVER strings. - * The WAIT_AUTH_2 state indicates that the socket is inbound - * (allocated by a LISTENER) but has not yet sent and received - * SERVER strings. - * The CONNECTED state represents a fully authorized, fully - * connected server. + * + * CONNECTING: indicates an outbound socket which is + * waiting to be writeable. + * WAIT_AUTH_1: indicates the socket is outbound and + * has successfully connected, but has not + * yet sent and received SERVER strings. + * WAIT_AUTH_2: indicates that the socket is inbound + * but has not yet sent and received + * SERVER strings. + * CONNECTED: represents a fully authorized, fully + * connected server. + * DYING: represents a server that has had an error. */ -enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED }; - -/** Every SERVER connection inbound or outbound is represented by - * an object of type TreeSocket. - * TreeSockets, being inherited from InspSocket, can be tied into - * the core socket engine, and we cn therefore receive activity events - * for them, just like activex objects on speed. (yes really, that - * is a technical term!) Each of these which relates to a locally - * connected server is assocated with it, by hooking it onto a - * TreeSocket class using its constructor. In this way, we can - * maintain a list of servers, some of which are directly connected, - * some of which are not. +enum ServerState { CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED, DYING }; + +struct CapabData +{ + reference link; /* Link block used for this connection */ + reference ac; /* Autoconnect used to cause this connection, if any */ + std::string ModuleList; /* Required module list of other server from CAPAB */ + std::string OptModuleList; /* Optional module list of other server from CAPAB */ + std::string ChanModes; + std::string UserModes; + std::map CapKeys; /* CAPAB keys from other server */ + std::string ourchallenge; /* Challenge sent for challenge/response */ + std::string theirchallenge; /* Challenge recv for challenge/response */ + int capab_phase; /* Have sent CAPAB already */ + bool auth_fingerprint; /* Did we auth using SSL fingerprint */ + bool auth_challenge; /* Did we auth using challenge/response */ + + // Data saved from incoming SERVER command, for later use when our credentials have been accepted by the other party + std::string description; + std::string sid; + std::string name; + bool hidden; +}; + +/** Every SERVER connection inbound or outbound is represented by an object of + * type TreeSocket. During setup, the object can be found in Utils->timeoutlist; + * after setup, MyRoot will have been created as a child of Utils->TreeRoot */ -class TreeSocket : public InspSocket +class TreeSocket : public BufferedSocket { - SpanningTreeUtilities* Utils; - std::string myhost; - std::string in_buffer; - ServerState LinkState; - std::string InboundServerName; - std::string InboundDescription; - int num_lost_users; - int num_lost_servers; - time_t NextPing; - bool LastPingWasGood; - bool bursting; - unsigned int keylength; - std::string ModuleList; - std::map CapKeys; - Module* Hook; + SpanningTreeUtilities* Utils; /* Utility class */ + std::string linkID; /* Description for this link */ + ServerState LinkState; /* Link state */ + CapabData* capab; /* Link setup data (held until burst is sent) */ + TreeServer* MyRoot; /* The server we are talking to */ + int proto_version; /* Remote protocol version */ + bool ConnectionFailureShown; /* Set to true if a connection failure message was shown */ + + static const unsigned int FMODE_MAX_LENGTH = 350; + + /** Checks if the given servername and sid are both free + */ + bool CheckDuplicate(const std::string& servername, const std::string& sid); public: + time_t age; /** Because most of the I/O gubbins are encapsulated within - * InspSocket, we just call the superclass constructor for + * BufferedSocket, we just call the superclass constructor for * most of the action, and append a few of our own values * to it. */ - TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, Module* HookMod = NULL); - - TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName, Module* HookMod = NULL); + TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* myac, const std::string& ipaddr); /** 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(SpanningTreeUtilities* Util, InspIRCd* SI, int newfd, char* ip, Module* HookMod = NULL); + TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server); + /** Get link state + */ ServerState GetLinkState(); - Module* GetHook(); + /** Get challenge set in our CAPAB for challenge/response + */ + const std::string& GetOurChallenge(); + + /** Get challenge set in our CAPAB for challenge/response + */ + void SetOurChallenge(const std::string &c); + + /** Get challenge set in their CAPAB for challenge/response + */ + const std::string& GetTheirChallenge(); + + /** Get challenge set in their CAPAB for challenge/response + */ + void SetTheirChallenge(const std::string &c); + /** Compare two passwords based on authentication scheme + */ + bool ComparePass(const Link& link, const std::string &theirs); + + /** Clean up information used only during server negotiation + */ + void CleanNegotiationInfo(); + + CullResult cull(); + /** Destructor + */ ~TreeSocket(); + /** Construct a password, optionally hashed with the other side's + * challenge string + */ + std::string MakePass(const std::string &password, const std::string &challenge); + /** When an outbound connection finishes connecting, we receive * this event, and must send our SERVER string to the other * side. If the other side is happy, as outlined in the server * to server docs on the inspircd.org site, the other side * will then send back its own server string. */ - virtual bool OnConnected(); + virtual void OnConnected(); - virtual void OnError(InspSocketError e); + /** Handle socket error event + */ + virtual void OnError(BufferedSocketError e); - virtual int OnDisconnect(); + /** Sends an error to the remote server, and displays it locally to show + * that it was sent. + */ + void SendError(const std::string &errormessage); /** Recursively send the server tree with distances as hops. * This is used during network burst to inform the other server @@ -126,17 +188,23 @@ class TreeSocket : public InspSocket */ void SendServers(TreeServer* Current, TreeServer* s, int hops); - std::string MyCapabilities(); + /** Returns module list as a string, filtered by filter + * @param filter a module version bitmask, such as VF_COMMON or VF_OPTCOMMON + */ + std::string MyModules(int filter); - void SendCapabilities(); + /** Send my capabilities to the remote side + */ + void SendCapabilities(int phase); - /* Check a comma seperated list for an item */ - bool HasItem(const std::string &list, const std::string &item); + /** Add modules to VF_COMMON list for backwards compatability */ + void CompatAddModules(std::vector& modlist); - /* Isolate and return the elements that are different between two comma seperated lists */ - std::string ListDifference(const std::string &one, const std::string &two); + /* Isolate and return the elements that are different between two lists */ + void ListDifference(const std::string &one, const std::string &two, char sep, + std::string& mleft, std::string& mright); - bool Capab(const std::deque ¶ms); + bool Capab(const parameterlist ¶ms); /** This function forces this server to quit, removing this server * and any users on it (and servers and users below that, etc etc). @@ -144,7 +212,7 @@ class TreeSocket : public InspSocket * is having a REAL bad hair day, this function shouldnt be called * too many times a month ;-) */ - void SquitServer(std::string &from, TreeServer* Current); + void SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users); /** This is a wrapper function for SquitServer above, which * does some validation first and passes on the SQUIT to all @@ -152,32 +220,23 @@ class TreeSocket : public InspSocket */ void Squit(TreeServer* Current, const std::string &reason); - /** FMODE command - server mode with timestamp checks */ - bool ForceMode(const std::string &source, std::deque ¶ms); - - /** FTOPIC command */ - bool ForceTopic(const std::string &source, std::deque ¶ms); - - /** FJOIN, similar to TS6 SJOIN, but not quite. */ - bool ForceJoin(const std::string &source, std::deque ¶ms); - - /** NICK command */ - bool IntroduceClient(const std::string &source, std::deque ¶ms); + /* Used on nick collision ... XXX ugly function HACK */ + int DoCollision(User *u, time_t remotets, const std::string &remoteident, const std::string &remoteip, const std::string &remoteuid); /** Send one or more FJOINs for a channel of users. * If the length of a single line is more than 480-NICKMAX * in length, it is split over multiple lines. */ - void SendFJoins(TreeServer* Current, chanrec* c); + void SendFJoins(Channel* c); /** Send G, Q, Z and E lines */ - void SendXLines(TreeServer* Current); + void SendXLines(); /** Send channel modes and topics */ - void SendChannelModes(TreeServer* Current); + void SendChannelModes(); /** send all users and their oper state/modes */ - void SendUsers(TreeServer* Current); + void SendUsers(); /** This function is called when we want to send a netburst to a local * server. There is a set order we must do this, because for example @@ -187,92 +246,92 @@ class TreeSocket : public InspSocket void DoBurst(TreeServer* s); /** This function is called when we receive data from a remote - * server. We buffer the data in a std::string (it doesnt stay - * there for long), reading using InspSocket::Read() which can - * read up to 16 kilobytes in one operation. - * - * IF THIS FUNCTION RETURNS FALSE, THE CORE CLOSES AND DELETES - * THE SOCKET OBJECT FOR US. + * server. */ - virtual bool OnDataReady(); - - int WriteLine(std::string line); + void OnDataReady(); - /* Handle ERROR command */ - bool Error(std::deque ¶ms); + /** Send one or more complete lines down the socket + */ + void WriteLine(std::string line); - /** remote MOTD. leet, huh? */ - bool Motd(const std::string &prefix, std::deque ¶ms); + /** Handle ERROR command */ + void Error(parameterlist ¶ms); - /** remote ADMIN. leet, huh? */ - bool Admin(const std::string &prefix, std::deque ¶ms); + /** Remote AWAY */ + bool Away(const std::string &prefix, parameterlist ¶ms); - bool Stats(const std::string &prefix, std::deque ¶ms); + /** SAVE to resolve nick collisions without killing */ + bool ForceNick(const std::string &prefix, parameterlist ¶ms); - /** Because the core won't let users or even SERVERS set +o, - * we use the OPERTYPE command to do this. + /** ENCAP command */ - bool OperType(const std::string &prefix, std::deque ¶ms); + void Encap(User* who, parameterlist ¶ms); - /** Because Andy insists that services-compatible servers must - * implement SVSNICK and SVSJOIN, that's exactly what we do :p + /** OPERQUIT command */ - bool ForceNick(const std::string &prefix, std::deque ¶ms); + bool OperQuit(const std::string &prefix, parameterlist ¶ms); - /* - * Remote SQUIT (RSQUIT). Routing works similar to SVSNICK: Route it to the server that the target is connected to locally, - * then let that server do the dirty work (squit it!). Example: - * A -> B -> C -> D: oper on A squits D, A routes to B, B routes to C, C notices D connected locally, kills it. -- w00t + /** PONG */ - bool RemoteSquit(const std::string &prefix, std::deque ¶ms); - - bool ServiceJoin(const std::string &prefix, std::deque ¶ms); - - bool RemoteRehash(const std::string &prefix, std::deque ¶ms); - - bool RemoteKill(const std::string &prefix, std::deque ¶ms); - - bool LocalPong(const std::string &prefix, std::deque ¶ms); - - bool MetaData(const std::string &prefix, std::deque ¶ms); - - bool ServerVersion(const std::string &prefix, std::deque ¶ms); - - bool ChangeHost(const std::string &prefix, std::deque ¶ms); - - bool AddLine(const std::string &prefix, std::deque ¶ms); - - bool ChangeName(const std::string &prefix, std::deque ¶ms); + bool LocalPong(const std::string &prefix, parameterlist ¶ms); - bool Whois(const std::string &prefix, std::deque ¶ms); + /** VERSION + */ + bool ServerVersion(const std::string &prefix, parameterlist ¶ms); - bool Push(const std::string &prefix, std::deque ¶ms); + /** ADDLINE + */ + bool AddLine(const std::string &prefix, parameterlist ¶ms); - bool HandleSetTime(const std::string &prefix, std::deque ¶ms); + /** DELLINE + */ + bool DelLine(const std::string &prefix, parameterlist ¶ms); - bool Time(const std::string &prefix, std::deque ¶ms); + /** WHOIS + */ + bool Whois(const std::string &prefix, parameterlist ¶ms); - bool LocalPing(const std::string &prefix, std::deque ¶ms); + /** PUSH + */ + bool Push(const std::string &prefix, parameterlist ¶ms); - bool RemoveStatus(const std::string &prefix, std::deque ¶ms); + /** PING + */ + bool LocalPing(const std::string &prefix, parameterlist ¶ms); - bool RemoteServer(const std::string &prefix, std::deque ¶ms); + /** <- (remote) <- SERVER + */ + bool RemoteServer(const std::string &prefix, parameterlist ¶ms); - bool Outbound_Reply_Server(std::deque ¶ms); + /** (local) -> SERVER + */ + bool Outbound_Reply_Server(parameterlist ¶ms); - bool Inbound_Server(std::deque ¶ms); + /** (local) <- SERVER + */ + bool Inbound_Server(parameterlist ¶ms); - void Split(const std::string &line, std::deque &n); + /** Handle IRC line split + */ + void Split(const std::string &line, std::string& prefix, std::string& command, parameterlist ¶ms); - bool ProcessLine(std::string &line); + /** Process complete line from buffer + */ + void ProcessLine(std::string &line); - virtual std::string GetName(); + void ProcessConnectedLine(std::string& prefix, std::string& command, parameterlist& params); + /** Handle socket timeout from connect() + */ virtual void OnTimeout(); + /** Handle server quit on close + */ + virtual void Close(); - virtual void OnClose(); - - virtual int OnIncomingConnection(int newsock, char* ip); + /** Returns true if this server was introduced to the rest of the network + */ + bool Introduced(); }; #endif +