Propegate BURST and ENDBURST network-wide for timing of bursts, and to keep XLine...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket.h

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index a798976d2c87f25a4d83cb8a32104fcc3c7023ab..dcd114d592de661d3329b60e247c94a595c4b01b 100644 (file)
--- 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
@@ -62,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
@@ -71,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 */
@@ -84,7 +84,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<std::string,std::string> CapKeys;      /* CAPAB keys from other server */
@@ -96,14 +95,14 @@ class TreeSocket : public InspSocket
  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.
         */
@@ -166,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.
@@ -228,7 +227,7 @@ class TreeSocket : public InspSocket
        bool ForceJoin(const std::string &source, std::deque<std::string> &params);
 
        /* 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 char *remoteident, const char *remoteip, const char *remoteuid);
 
        /** UID command */
        bool ParseUID(const std::string &source, std::deque<std::string> &params);
@@ -237,7 +236,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 +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
@@ -331,6 +330,10 @@ class TreeSocket : public InspSocket
         */
        bool AddLine(const std::string &prefix, std::deque<std::string> &params);
 
+       /** DELLINE
+        */
+       bool DelLine(const std::string &prefix, std::deque<std::string> &params);
+
        /** CHGNAME
         */
        bool ChangeName(const std::string &prefix, std::deque<std::string> &params);