m_spanningtree Assign an id to new Memberships

[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 a579d2fc71d9d717fcc70043ec814e68544be9e1..ab47012b0870d7cbce55e865041ba014fc58d732 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -37,18 +37,15 @@
  * TreeServer items, deleting and inserting them as they
  * are created and destroyed.
  */
-class TreeServer : public classbase
+class TreeServer : public Server
 {
        TreeServer* Parent;                     /* Parent entry */
        TreeServer* Route;                      /* Route entry */
        std::vector<TreeServer*> Children;      /* List of child objects */
-       std::string ServerName;                 /* Server's name */
-       std::string ServerDesc;                 /* Server's description */
        std::string VersionString;              /* Version string or empty string */
-       TreeSocket* Socket;                     /* For directly connected servers this points at the socket object */
+       TreeSocket* Socket;                     /* Socket used to communicate with this server */
        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 */
 
        /** This method is used to add this TreeServer to the
@@ -57,6 +54,7 @@ class TreeServer : public classbase
        void AddHashEntry();
 
  public:
+       typedef std::vector<TreeServer*> ChildServers;
        FakeUser* const ServerUser;             /* User representing this server */
        const time_t age;
 
@@ -70,13 +68,13 @@ class TreeServer : public classbase
         * 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);
+       TreeServer();
 
        /** 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, const std::string& Name, const std::string& Desc, const std::string& id, TreeServer* Above, TreeSocket* Sock, bool Hide);
+       TreeServer(const std::string& Name, const std::string& Desc, const std::string& id, TreeServer* Above, TreeSocket* Sock, bool Hide);
 
        int QuitUsers(const std::string &reason);
 
@@ -86,13 +84,13 @@ class TreeServer : public classbase
         */
        TreeServer* GetRoute();
 
-       /** Get server name
+       /** Returns true if this server is the tree root (i.e.: us)
         */
-       const std::string& GetName() const { return ServerName; }
+       bool IsRoot() const { return (this->Parent == NULL); }
 
-       /** Get server description (GECOS)
+       /** Returns true if this server is locally connected
         */
-       const std::string& GetDesc();
+       bool IsLocal() const { return (this->Route == this); }
 
        /** Get server version string
         */
@@ -144,13 +142,9 @@ class TreeServer : public classbase
         */
        void SetVersion(const std::string &Version);
 
-       /** Return number of child servers
+       /** Return all child servers
         */
-       unsigned int ChildCount();
-
-       /** Return a child server indexed 0..n
-        */
-       TreeServer* GetChild(unsigned int n);
+       const ChildServers& GetChildren() const { return Children; }
 
        /** Add a child server
         */
@@ -164,7 +158,7 @@ class TreeServer : public classbase
         * This is used during netsplits to automatically tidy up the
         * server tree. It is slow, we don't use it for much else.
         */
-       bool Tidy();
+       void Tidy();
 
        /** Get server ID
         */
@@ -176,6 +170,10 @@ class TreeServer : public classbase
        /** Recursive call for child servers */
        void FinishBurstInternal();
 
+       /** (Re)check the uline state of this server
+        */
+       void CheckULine();
+
        CullResult cull();
 
        /** Destructor
@@ -183,4 +181,13 @@ class TreeServer : public classbase
         * hash maps.
         */
        ~TreeServer();
+
+       /** Returns the TreeServer the given user is connected to
+        * @param user The user whose server to return
+        * @return The TreeServer this user is connected to.
+        */
+       static TreeServer* Get(User* user)
+       {
+               return static_cast<TreeServer*>(user->server);
+       }
 };