X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=460231502a76c532a7da5ff9567ed848882a9ab2;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=125fdbd67924e228aa8af58de9b05ed767e7f703;hpb=66d187fa55b4fdcb38ec987c269c4c1573a441b5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h index 125fdbd67..460231502 100644 --- a/src/modules/m_spanningtree/treeserver.h +++ b/src/modules/m_spanningtree/treeserver.h @@ -1,18 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#ifndef __TREESERVER_H__ -#define __TREESERVER_H__ + +#pragma once + +#include "treesocket.h" /** Each server in the tree is represented by one class of * type TreeServer. A locally connected TreeServer can @@ -30,41 +39,45 @@ */ class TreeServer : public classbase { - InspIRCd* ServerInstance; /* Creator */ TreeServer* Parent; /* Parent entry */ TreeServer* Route; /* Route entry */ std::vector Children; /* List of child objects */ 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 */ 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: + FakeUser* const ServerUser; /* User representing this server */ + time_t age; bool Warned; /* True if we've warned opers about high latency on this server */ + bool bursting; /* whether or not this server is bursting */ - /** 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); + unsigned int UserCount; /* How many users are on this server? [note: doesn't care about +i] */ + unsigned int OperCount; /* How many opers are on this server? */ /** 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, 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, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide); int QuitUsers(const std::string &reason); @@ -92,11 +105,11 @@ class TreeServer : public classbase /** Get server description (GECOS) */ - std::string GetDesc(); + const std::string& GetDesc(); /** Get server version string */ - std::string GetVersion(); + const std::string& GetVersion(); /** Set time we are next due to ping this server */ @@ -106,11 +119,7 @@ class TreeServer : public classbase */ time_t NextPingTime(); - /** Time of last ping used to calculate this->rtt below - */ - time_t LastPing; - - /** Last ping time in microseconds, used to calculate round trip time + /** Last ping time in milliseconds, used to calculate round trip time */ unsigned long LastPingMsec; @@ -118,6 +127,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; @@ -130,22 +143,6 @@ class TreeServer : public classbase */ void SetPingFlag(); - /** Get the number of users on this server for MAP - */ - int GetUserCount(); - - /** Increment the user counter - */ - void AddUserCount(); - - /** Decrement the user counter - */ - void DelUserCount(); - - /** Get the oper count for this server - */ - int GetOperCount(); - /** Get the TreeSocket pointer for local servers. * For remote servers, this returns NULL. */ @@ -184,16 +181,16 @@ class TreeServer : public classbase /** Get server ID */ - std::string& GetID(); + const std::string& GetID(); - /** Set server ID + /** Marks a server as having finished bursting and performs appropriate actions. */ - void SetID(const std::string &id); + void FinishBurst(); + /** Recursive call for child servers */ + void FinishBurstInternal(); + CullResult cull(); /** Destructor */ ~TreeServer(); - }; - -#endif