X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=31231c7958862b6272debb6e9de04a1cbc3994bc;hb=0df7645dbbf073517e8ba32764e86651d9cbd834;hp=a798976d2c87f25a4d83cb8a32104fcc3c7023ab;hpb=b3961a3e36b20cbb1f17197203739fb52222a9ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index a798976d2..31231c795 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 @@ -18,7 +18,6 @@ #include "commands/cmd_stats.h" #include "socket.h" #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "transport.h" @@ -44,25 +43,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 @@ -71,7 +68,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 */ @@ -84,7 +81,6 @@ class TreeSocket : public InspSocket 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 */ @@ -96,18 +92,11 @@ class TreeSocket : public InspSocket public: /** 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, 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. */ - 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, InspIRCd* SI, std::string host, int port, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Module* HookMod = NULL); /** When a listening socket gives us a new file descriptor, * we must associate it with a socket without creating a new @@ -166,7 +155,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. @@ -228,7 +217,7 @@ class TreeSocket : public InspSocket bool ForceJoin(const std::string &source, std::deque ¶ms); /* Used on nick collision ... XXX ugly function HACK */ - int DoCollision(userrec *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid); + int DoCollision(User *u, time_t remotets, const std::string &remoteident, const std::string &remoteip, const std::string &remoteuid); /** UID command */ bool ParseUID(const std::string &source, std::deque ¶ms); @@ -237,7 +226,7 @@ class TreeSocket : public InspSocket * 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); @@ -257,7 +246,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 @@ -267,7 +256,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); @@ -293,6 +282,16 @@ class TreeSocket : public InspSocket */ bool ForceNick(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); + + /** OPERQUIT command + */ bool OperQuit(const std::string &prefix, std::deque ¶ms); /** SVSJOIN @@ -303,10 +302,6 @@ class TreeSocket : public InspSocket */ bool ServicePart(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); @@ -331,6 +326,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); @@ -343,10 +342,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); @@ -391,10 +386,6 @@ class TreeSocket : public InspSocket /** Handle socket close event */ virtual void OnClose(); - - /** Handle incoming connection event - */ - virtual int OnIncomingConnection(int newsock, char* ip); }; /* Used to validate the value lengths of multiple parameters for a command */