Remove unneeded Extensible inheritance and remove "age" field from classbase

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

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 514d6bc07a04c37fb7a7679f72ac6296926ca682..e8db09cdf1946e433bf3bba02161c55e46788e01 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.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.
@@ -37,33 +37,37 @@ class TreeServer : public classbase
        irc::string ServerName;                 /* Server's name */
        std::string ServerDesc;                 /* Server's description */
        std::string VersionString;              /* Version string or empty string */
-       int UserCount;                          /* Not used in this version */
-       int OperCount;                          /* Not used in this version */
+       unsigned int ServerUserCount;           /* How many users are on this server? [note: doesn't care about +i] */
+       unsigned int ServerOperCount;           /* How many opers are on this server? */
        TreeSocket* Socket;                     /* For directly connected servers this points at the socket object */
        time_t NextPing;                        /* After this time, the server should be PINGed*/
        bool LastPingWasGood;                   /* True if the server responded to the last PING with a PONG */
        SpanningTreeUtilities* Utils;           /* Utility class */
+       std::string sid;                        /* Server ID */
+
+       /** Set server ID
+        * @param id Server ID
+        * @throws CoreException on duplicate ID
+        */
+       void SetID(const std::string &id);
 
  public:
+       time_t age;
 
        bool Warned;                            /* True if we've warned opers about high latency on this server */
-
-       /** We don't use this constructor. Its a dummy, and won't cause any insertion
-        * of the TreeServer into the hash_map. See below for the two we DO use.
-        */
-       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance);
+       bool bursting;                          /* whether or not this server is bursting */
 
        /** We use this constructor only to create the 'root' item, Utils->TreeRoot, which
         * represents our own server. Therefore, it has no route, no parent, and
         * no socket associated with it. Its version string is our own local version.
         */
-       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc);
-       
+       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id);
+
        /** When we create a new server, we call this constructor to initialize it.
         * This constructor initializes the server's Route and Parent, and sets up
         * its ping counters so that it will be pinged one minute from now.
         */
-       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, TreeServer* Above, TreeSocket* Sock, bool Hide);
+       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide);
 
        int QuitUsers(const std::string &reason);
 
@@ -105,13 +109,17 @@ class TreeServer : public classbase
         */
        time_t NextPingTime();
 
-       /** Time of last ping used to calculate this->rtt below
+       /** Last ping time in microseconds, used to calculate round trip time
         */
-       time_t LastPing;
+       unsigned long LastPingMsec;
 
        /** Round trip time of last ping
         */
-       time_t rtt;
+       unsigned long rtt;
+
+       /** When we recieved BURST from this server, used to calculate total burst time at ENDBURST.
+        */
+       unsigned long StartBurst;
 
        /** True if this server is hidden
         */
@@ -125,21 +133,21 @@ class TreeServer : public classbase
         */
        void SetPingFlag();
 
-       /** Get the number of users on this server for MAP
+       /** Get the number of users on this server.
         */
-       int GetUserCount();
+       unsigned int GetUserCount();
 
-       /** Increment the user counter
+       /** Increment or decrement the user count by diff.
         */
-       void AddUserCount();
+       void SetUserCount(int diff);
 
-       /** Decrement the user counter
+       /** Gets the numbers of opers on this server.
         */
-       void DelUserCount();
+       unsigned int GetOperCount();
 
-       /** Get the oper count for this server
+       /** Increment or decrement the oper count by diff.
         */
-       int GetOperCount();
+       void SetOperCount(int diff);
 
        /** Get the TreeSocket pointer for local servers.
         * For remote servers, this returns NULL.
@@ -177,6 +185,16 @@ class TreeServer : public classbase
         */
        bool Tidy();
 
+       /** Get server ID
+        */
+       std::string& GetID();
+
+       /** Marks a server as having finished bursting and performs appropriate actions.
+        */
+       void FinishBurst();
+       /** Recursive call for child servers */
+       void FinishBurstInternal();
+
        /** Destructor
         */
        ~TreeServer();