X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=324203f115811db6315bc391944c4521fb673d4d;hb=d7a0cd3db1e8b64a6f706f1831e645ad69aa7927;hp=b5457221ae3255507eeef755d947df8f52f25259;hpb=c2cd89cd5281c688b6693001f9d3951f3b7716a3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index b5457221a..324203f11 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -14,10 +14,6 @@ #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" @@ -66,7 +62,7 @@ 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 + * 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,7 +71,7 @@ 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 */ @@ -83,11 +79,11 @@ class TreeSocket : public InspSocket 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::map CapKeys; /* CAPAB keys from other server */ @@ -95,17 +91,18 @@ class TreeSocket : public InspSocket std::string ourchallenge; /* Challenge sent for challenge/response */ std::string theirchallenge; /* Challenge recv for challenge/response */ std::string OutboundPass; /* Outbound password */ + bool sentcapab; /* Have sent CAPAB already */ public: /** 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 + * BufferedSocket, we just call the superclass constructor for * most of the action, and append a few of our own values * to it. */ @@ -168,7 +165,7 @@ class TreeSocket : public InspSocket /** 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. @@ -229,14 +226,17 @@ class TreeSocket : public InspSocket /** 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 char *remoteident, const char *remoteip, const char *remoteuid); + + /** UID command */ + bool ParseUID(const std::string &source, std::deque ¶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); @@ -256,7 +256,7 @@ class TreeSocket : public InspSocket /** 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 + * there for long), reading using BufferedSocket::Read() which can * read up to 16 kilobytes in one operation. * * IF THIS FUNCTION RETURNS FALSE, THE CORE CLOSES AND DELETES @@ -266,7 +266,7 @@ class TreeSocket : public InspSocket /** 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); @@ -292,21 +292,25 @@ class TreeSocket : public InspSocket */ bool ForceNick(const std::string &prefix, std::deque ¶ms); - bool OperQuit(const std::string &prefix, std::deque ¶ms); + /** PRIVMSG or NOTICE with server origin ONLY + */ + bool ServerMessage(const std::string &messagetype, const std::string &prefix, std::deque ¶ms, const std::string &sourceserv); + + /** ENCAP command + */ + bool Encap(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 + /** OPERQUIT command */ - bool RemoteSquit(const std::string &prefix, std::deque ¶ms); + bool OperQuit(const std::string &prefix, std::deque ¶ms); /** SVSJOIN */ bool ServiceJoin(const std::string &prefix, std::deque ¶ms); - /** REHASH + /** SVSPART */ - bool RemoteRehash(const std::string &prefix, std::deque ¶ms); + bool ServicePart(const std::string &prefix, std::deque ¶ms); /** KILL */ @@ -332,6 +336,10 @@ class TreeSocket : public InspSocket */ bool AddLine(const std::string &prefix, std::deque ¶ms); + /** DELLINE + */ + bool DelLine(const std::string &prefix, std::deque ¶ms); + /** CHGNAME */ bool ChangeName(const std::string &prefix, std::deque ¶ms); @@ -344,10 +352,6 @@ class TreeSocket : public InspSocket */ 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); @@ -398,5 +402,21 @@ class TreeSocket : public InspSocket virtual int OnIncomingConnection(int newsock, char* ip); }; +/* Used to validate the value lengths of multiple parameters for a command */ +struct cmd_validation +{ + const char* item; + size_t param; + 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