X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=e8db09cdf1946e433bf3bba02161c55e46788e01;hb=63d3e056b742598f48ba9a8df216b06117a37910;hp=06e827fdcfc93dd73e18b0d1e1088b078521a637;hpb=1c63bc4c57bb27b305b1624a4c8e415ac914662b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h index 06e827fdc..e8db09cdf 100644 --- 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-2008 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. @@ -44,7 +44,6 @@ class TreeServer : public classbase bool LastPingWasGood; /* True if the server responded to the last PING with a PONG */ SpanningTreeUtilities* Utils; /* Utility class */ std::string sid; /* Server ID */ - bool DupError; /* True if the server ID is duplicated (!) */ /** Set server ID * @param id Server ID @@ -53,20 +52,17 @@ class TreeServer : public classbase 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, const std::string &id); + 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, 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. @@ -121,6 +117,10 @@ class TreeServer : public classbase */ 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 */ bool Hidden; @@ -189,9 +189,11 @@ class TreeServer : public classbase */ std::string& GetID(); - /** True on duplicate server ID (server not usable) + /** Marks a server as having finished bursting and performs appropriate actions. */ - bool DuplicateID(); + void FinishBurst(); + /** Recursive call for child servers */ + void FinishBurstInternal(); /** Destructor */