X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=520026a99db9d264ea8504c7770a217da5d696f6;hb=78aabc62e7510af5075b2056f703f0aa42e328a4;hp=079d4fe92bb2fd8fce4af9a51f072e623ab9a79e;hpb=8460f081ada5ae3fe98a67e6c52e2646e2446b8a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index 079d4fe92..520026a99 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -14,19 +14,13 @@ #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" #include "socket.h" #include "inspircd.h" -#include "wildcard.h" #include "xline.h" -#include "transport.h" +#include "../transport.h" -#include "m_spanningtree/utils.h" +#include "utils.h" +#include "handshaketimer.h" /* * The server list in InspIRCd is maintained as two structures @@ -48,25 +42,23 @@ * 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. */ -enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED }; +enum ServerState { 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 + * TreeSockets, being inherited from BufferedSocket, 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 @@ -75,47 +67,46 @@ enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED }; * maintain a list of servers, some of which are directly connected, * some of which are not. */ -class TreeSocket : public InspSocket +class TreeSocket : public BufferedSocket { SpanningTreeUtilities* Utils; /* Utility class */ std::string myhost; /* Canonical hostname */ - std::string in_buffer; /* Input buffer */ 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 */ + std::string InboundSID; /* Server ID sent to us by the other side */ int num_lost_users; /* Users lost in split */ int num_lost_servers; /* Servers lost in split */ 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::string IP; + std::string ModuleList; /* Required module list of other server from CAPAB */ + std::string OptModuleList; /* Optional 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 */ std::string OutboundPass; /* Outbound password */ + 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 */ + int proto_version; /* Remote protocol version */ public: + HandshakeTimer* hstimer; /* Handshake timer, needed to work around I/O hook buffering */ + reference myautoconnect; /* Autoconnect used to cause this connection, if any */ + 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, std::string host, int port, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Autoconnect* myac, Module* HookMod = NULL); /** 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, char* ip, Autoconnect* myac, Module* HookMod = NULL); /** Get link state */ @@ -139,11 +130,11 @@ class TreeSocket : public InspSocket /** Compare two passwords based on authentication scheme */ - bool ComparePass(const std::string &ours, const std::string &theirs); + bool ComparePass(const Link& link, const std::string &theirs); - /** Return the module which we are hooking to for I/O encapsulation + /** Clean up information used only during server negotiation */ - Module* GetHook(); + void CleanNegotiationInfo(); /** Destructor */ @@ -164,21 +155,17 @@ 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); /** Sends an error to the remote server, and displays it locally to show * that it was sent. */ void SendError(const std::string &errormessage); - /** Handle socket disconnect event - */ - virtual int OnDisconnect(); - /** Recursively send the server tree with distances as hops. * This is used during network burst to inform the other server * (and any of ITS servers too) of what servers we know about. @@ -190,13 +177,17 @@ 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); + + /** Add modules to VF_COMMON list for backwards compatability */ + void CompatAddModules(std::vector& modlist); /* Check a comma seperated list for an item */ bool HasItem(const std::string &list, const std::string &item); @@ -204,7 +195,7 @@ class TreeSocket : public InspSocket /* Isolate and return the elements that are different between two comma seperated lists */ std::string ListDifference(const std::string &one, const std::string &two); - 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). @@ -221,22 +212,25 @@ 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); + bool ForceMode(const std::string &source, parameterlist ¶ms); /** FTOPIC command */ - bool ForceTopic(const std::string &source, std::deque ¶ms); + bool ForceTopic(const std::string &source, parameterlist ¶ms); /** FJOIN, similar to TS6 SJOIN, but not quite. */ - bool ForceJoin(const std::string &source, std::deque ¶ms); + bool ForceJoin(const std::string &source, parameterlist ¶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); - /** NICK command */ - bool IntroduceClient(const std::string &source, std::deque ¶ms); + /** UID command */ + bool ParseUID(const std::string &source, parameterlist ¶ms); /** 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); @@ -255,127 +249,135 @@ 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); + bool Error(parameterlist ¶ms); /** remote MOTD. leet, huh? */ - bool Motd(const std::string &prefix, std::deque ¶ms); + bool Motd(const std::string &prefix, parameterlist ¶ms); /** remote ADMIN. leet, huh? */ - bool Admin(const std::string &prefix, std::deque ¶ms); + bool Admin(const std::string &prefix, parameterlist ¶ms); /** Remote MODULES */ - bool Modules(const std::string &prefix, std::deque ¶ms); + bool Modules(const std::string &prefix, parameterlist ¶ms); - bool Stats(const std::string &prefix, std::deque ¶ms); + bool Stats(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. */ - bool OperType(const std::string &prefix, std::deque ¶ms); + bool OperType(const std::string &prefix, parameterlist ¶ms); + + /** Remote AWAY */ + bool Away(const std::string &prefix, parameterlist ¶ms); /** Because Andy insists that services-compatible servers must * implement SVSNICK and SVSJOIN, that's exactly what we do :p */ - bool ForceNick(const std::string &prefix, std::deque ¶ms); + bool SVSNick(const std::string &prefix, parameterlist ¶ms); + + /** SAVE to resolve nick collisions without killing */ + bool ForceNick(const std::string &prefix, parameterlist ¶ms); + + /** PRIVMSG or NOTICE with server origin ONLY + */ + bool ServerMessage(const std::string &messagetype, const std::string &prefix, parameterlist ¶ms, const std::string &sourceserv); - bool OperQuit(const std::string &prefix, std::deque ¶ms); + /** ENCAP command + */ + bool Encap(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 + /** OPERQUIT command */ - bool RemoteSquit(const std::string &prefix, std::deque ¶ms); + bool OperQuit(const std::string &prefix, parameterlist ¶ms); /** SVSJOIN */ - bool ServiceJoin(const std::string &prefix, std::deque ¶ms); + bool ServiceJoin(const std::string &prefix, parameterlist ¶ms); - /** REHASH + /** SVSPART */ - bool RemoteRehash(const std::string &prefix, std::deque ¶ms); + bool ServicePart(const std::string &prefix, parameterlist ¶ms); /** KILL */ - bool RemoteKill(const std::string &prefix, std::deque ¶ms); + bool RemoteKill(const std::string &prefix, parameterlist ¶ms); /** PONG */ - bool LocalPong(const std::string &prefix, std::deque ¶ms); + bool LocalPong(const std::string &prefix, parameterlist ¶ms); /** METADATA */ - bool MetaData(const std::string &prefix, std::deque ¶ms); + bool MetaData(const std::string &prefix, parameterlist ¶ms); /** VERSION */ - bool ServerVersion(const std::string &prefix, std::deque ¶ms); + bool ServerVersion(const std::string &prefix, parameterlist ¶ms); /** CHGHOST */ - bool ChangeHost(const std::string &prefix, std::deque ¶ms); + bool ChangeHost(const std::string &prefix, parameterlist ¶ms); /** ADDLINE */ - bool AddLine(const std::string &prefix, std::deque ¶ms); + bool AddLine(const std::string &prefix, parameterlist ¶ms); + + /** DELLINE + */ + bool DelLine(const std::string &prefix, parameterlist ¶ms); /** CHGNAME */ - bool ChangeName(const std::string &prefix, std::deque ¶ms); + bool ChangeName(const std::string &prefix, parameterlist ¶ms); + + /** FIDENT */ + bool ChangeIdent(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); + bool Push(const std::string &prefix, parameterlist ¶ms); /** TIME */ - bool Time(const std::string &prefix, std::deque ¶ms); + bool Time(const std::string &prefix, parameterlist ¶ms); /** PING */ - bool LocalPing(const std::string &prefix, std::deque ¶ms); + bool LocalPing(const std::string &prefix, parameterlist ¶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 RemoveStatus(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 */ - void Split(const std::string &line, std::deque &n); + void Split(const std::string &line, parameterlist &n); /** Process complete line from buffer */ @@ -388,14 +390,9 @@ class TreeSocket : public InspSocket /** 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(); }; /* Used to validate the value lengths of multiple parameters for a command */ @@ -406,5 +403,13 @@ struct cmd_validation size_t length; }; +/* Used to validate the length values in CAPAB CAPABILITIES */ +struct cap_validation +{ + const char* reason; + const char* key; + size_t size; +}; + #endif