X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=80f9e0798e1c2895e5b9063950e9d8344ea94490;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=2fd18b35a6c270b10563a81524fff6c8e1e5e7ea;hpb=be36d92f3dcb0ac3772daebff43a5ecfe0a2d364;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index 2fd18b35a..80f9e0798 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,22 +11,14 @@ * --------------------------------------------------- */ -#ifndef __TREESOCKET_H__ -#define __TREESOCKET_H__ +#ifndef M_SPANNINGTREE_TREESOCKET_H +#define M_SPANNINGTREE_TREESOCKET_H -#include "configreader.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.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 @@ -48,74 +40,66 @@ * 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 */ +}; + +/** 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; /* Utility class */ - std::string myhost; /* Canonical hostname */ - std::string in_buffer; /* Input buffer */ + std::string linkID; /* Description for this link */ ServerState LinkState; /* Link state */ - std::string InboundServerName; /* Server name sent to us by other side */ - std::string InboundDescription; /* Server description (GECOS) sent to us by the other side */ - int num_lost_users; /* Users lost in split */ - int num_lost_servers; /* Servers lost in split */ + CapabData* capab; /* Link setup data (held until burst is sent) */ + TreeServer* MyRoot; /* The server we are talking to */ time_t NextPing; /* Time when we are due to ping this server */ bool LastPingWasGood; /* Responded to last ping we sent? */ - bool bursting; /* True if not finished bursting yet */ - unsigned int keylength; /* Is this still used? */ - std::string ModuleList; /* Module list of other server from CAPAB */ - std::map CapKeys; /* CAPAB keys from other server */ - Module* Hook; /* I/O hooking module that we're attached to for this socket */ - std::string ourchallenge; /* Challenge sent for challenge/response */ - std::string theirchallenge; /* Challenge recv for challenge/response */ - + int proto_version; /* Remote protocol version */ 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); - - /** Because most of the I/O gubbins are encapsulated within - * InspSocket, 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, const std::string &ServerName, const std::string &bindto, 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 */ @@ -137,17 +121,23 @@ class TreeSocket : public InspSocket */ void SetTheirChallenge(const std::string &c); - /** Return the module which we are hooking to for I/O encapsulation + /** Compare two passwords based on authentication scheme + */ + bool ComparePass(const Link& link, const std::string &theirs); + + /** Clean up information used only during server negotiation */ - Module* GetHook(); + void CleanNegotiationInfo(); + CullResult cull(); /** Destructor */ ~TreeSocket(); - /** Generate random string used for challenge-response auth + /** Construct a password, optionally hashed with the other side's + * challenge string */ - std::string RandString(unsigned int length); + 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 @@ -155,15 +145,16 @@ class TreeSocket : public InspSocket * 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(); /** Handle socket error event */ - virtual void OnError(InspSocketError e); + virtual void OnError(BufferedSocketError e); - /** Handle socket disconnect event + /** Sends an error to the remote server, and displays it locally to show + * that it was sent. */ - virtual int OnDisconnect(); + 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 @@ -176,21 +167,23 @@ class TreeSocket : public InspSocket */ void SendServers(TreeServer* Current, TreeServer* s, int hops); - /** Returns my capabilities as a string + /** Returns module list as a string, filtered by filter + * @param filter a module version bitmask, such as VF_COMMON or VF_OPTCOMMON */ - std::string MyCapabilities(); + std::string MyModules(int filter); /** Send my capabilities to the remote side */ - void SendCapabilities(); + 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). @@ -198,7 +191,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 @@ -206,23 +199,14 @@ 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(TreeServer* Current, Channel* c); /** Send G, Q, Z and E lines */ void SendXLines(TreeServer* Current); @@ -241,147 +225,87 @@ 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(); + void OnDataReady(); /** Send one or more complete lines down the socket */ - int WriteLine(std::string line); + void WriteLine(std::string line); /** Handle ERROR command */ - bool Error(std::deque ¶ms); - - /** remote MOTD. leet, huh? */ - bool Motd(const std::string &prefix, std::deque ¶ms); - - /** remote ADMIN. leet, huh? */ - bool Admin(const std::string &prefix, std::deque ¶ms); + void Error(parameterlist ¶ms); - /** Remote MODULES */ - bool Modules(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, std::deque ¶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 - */ - bool RemoteSquit(const std::string &prefix, std::deque ¶ms); - - /** SVSJOIN - */ - bool ServiceJoin(const std::string &prefix, std::deque ¶ms); - - /** REHASH - */ - bool RemoteRehash(const std::string &prefix, std::deque ¶ms); - - /** KILL - */ - bool RemoteKill(const std::string &prefix, std::deque ¶ms); + bool OperQuit(const std::string &prefix, parameterlist ¶ms); /** PONG */ - bool LocalPong(const std::string &prefix, std::deque ¶ms); - - /** METADATA - */ - bool MetaData(const std::string &prefix, std::deque ¶ms); + bool LocalPong(const std::string &prefix, parameterlist ¶ms); /** VERSION */ - bool ServerVersion(const std::string &prefix, std::deque ¶ms); - - /** CHGHOST - */ - bool ChangeHost(const std::string &prefix, std::deque ¶ms); + bool ServerVersion(const std::string &prefix, parameterlist ¶ms); /** ADDLINE */ - bool AddLine(const std::string &prefix, std::deque ¶ms); + bool AddLine(const std::string &prefix, parameterlist ¶ms); - /** CHGNAME + /** DELLINE */ - bool ChangeName(const std::string &prefix, std::deque ¶ms); + bool DelLine(const std::string &prefix, parameterlist ¶ms); /** WHOIS */ - bool Whois(const std::string &prefix, std::deque ¶ms); + bool Whois(const std::string &prefix, parameterlist ¶ms); /** PUSH */ - bool Push(const std::string &prefix, std::deque ¶ms); - - /** SETTIME - */ - bool HandleSetTime(const std::string &prefix, std::deque ¶ms); - - /** TIME - */ - bool Time(const std::string &prefix, std::deque ¶ms); + bool Push(const std::string &prefix, parameterlist ¶ms); /** PING */ - bool LocalPing(const std::string &prefix, std::deque ¶ms); - - /** Remove all modes from a channel, including statusmodes (+qaovh etc), simplemodes, parameter modes. - * This does not update the timestamp of the target channel, this must be done seperately. - */ - bool RemoveStatus(const std::string &prefix, std::deque ¶ms); + bool LocalPing(const std::string &prefix, parameterlist ¶ms); /** <- (remote) <- SERVER */ - bool RemoteServer(const std::string &prefix, std::deque ¶ms); + bool RemoteServer(const std::string &prefix, parameterlist ¶ms); /** (local) -> SERVER */ - bool Outbound_Reply_Server(std::deque ¶ms); + bool Outbound_Reply_Server(parameterlist ¶ms); /** (local) <- SERVER */ - bool Inbound_Server(std::deque ¶ms); + bool Inbound_Server(parameterlist ¶ms); - /** Handle netsplit + /** Handle IRC line split */ - void Split(const std::string &line, std::deque &n); + void Split(const std::string &line, std::string& prefix, std::string& command, parameterlist ¶ms); /** Process complete line from buffer */ - bool ProcessLine(std::string &line); + void ProcessLine(std::string &line); - /** Get this server's name - */ - virtual std::string GetName(); + void ProcessConnectedLine(std::string& prefix, std::string& command, parameterlist& params); /** Handle socket timeout from connect() */ virtual void OnTimeout(); - - /** Handle socket close event - */ - virtual void OnClose(); - - /** Handle incoming connection event + /** Handle server quit on close */ - virtual int OnIncomingConnection(int newsock, char* ip); + virtual void Close(); }; #endif