X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=4465de15e4ea439563a86e0f4b3eae6eed2b4aab;hb=50ea7f41b2e4aca9ef9be31c056f862a7d90609a;hp=1d053112db127ba8c30efda0e625d82f089c391c;hpb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h index 1d053112d..4465de15e 100644 --- a/src/modules/m_spanningtree/treeserver.h +++ b/src/modules/m_spanningtree/treeserver.h @@ -1,5 +1,27 @@ -#ifndef __TREESERVER_H__ -#define __TREESERVER_H__ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards + * + * 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 . + */ + + +#pragma once + +#include "treesocket.h" /** Each server in the tree is represented by one class of * type TreeServer. A locally connected TreeServer can @@ -15,72 +37,111 @@ * TreeServer items, deleting and inserting them as they * are created and destroyed. */ -class TreeServer : public classbase +class TreeServer : public Server { - 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 */ + + /** Full version string including patch version and other info + */ + std::string fullversion; + + 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 */ - public: + /** Counter counting how many servers are bursting in front of this server, including + * this server. Set to parents' value on construction then it is increased if the + * server itself starts bursting. Decreased when a server on the path to this server + * finishes burst. + */ + unsigned int behind_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. + /** True if this server has been lost in a split and is awaiting destruction */ - TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance); + bool isdead; + + /** This method is used to add this TreeServer to the + * hash maps. It is only called by the constructors. + */ + void AddHashEntry(); + + /** Used by SQuit logic to recursively remove servers + */ + void SQuitInternal(unsigned int& num_lost_servers); + + /** Remove the reference to this server from the hash maps + */ + void RemoveHash(); + + public: + typedef std::vector ChildServers; + FakeUser* const ServerUser; /* User representing this server */ + const time_t age; + + bool Warned; /* True if we've warned opers about high latency on this server */ + + 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(); + /** 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); + 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); - - /** This method is used to add the structure to the - * hash_map for linear searches. It is only called - * by the constructors. + /** SQuit a server connected to this server, removing the given server and all servers behind it + * @param server Server to squit, must be directly below this server + * @param reason Reason for quitting the server, sent to opers and other servers */ - void AddHashEntry(); + void SQuitChild(TreeServer* server, const std::string& reason); - /** This method removes the reference to this object - * from the hash_map which is used for linear searches. - * It is only called by the default destructor. + /** SQuit this server, removing this server and all servers behind it + * @param reason Reason for quitting the server, sent to opers and other servers */ - void DelHashEntry(); + void SQuit(const std::string& reason) + { + GetParent()->SQuitChild(this, reason); + } + + static unsigned int QuitUsers(const std::string& reason); /** Get route. * The 'route' is defined as the locally- * connected server which can be used to reach this server. */ - TreeServer* GetRoute(); + TreeServer* GetRoute() const { return Route; } + + /** Returns true if this server is the tree root (i.e.: us) + */ + bool IsRoot() const { return (this->Parent == NULL); } - /** Get server name + /** Returns true if this server is locally connected */ - std::string GetName(); + bool IsLocal() const { return (this->Route == this); } - /** Get server description (GECOS) + /** Returns true if the server is awaiting destruction + * @return True if the server is waiting to be culled and deleted, false otherwise */ - std::string GetDesc(); + bool IsDead() const { return isdead; } /** Get server version string */ - std::string GetVersion(); + const std::string& GetVersion() const { return VersionString; } + + /** Get the full version string of this server + * @return The full version string of this server, including patch version and other info + */ + const std::string& GetFullVersion() const { return fullversion; } /** Set time we are next due to ping this server */ @@ -90,13 +151,21 @@ class TreeServer : public classbase */ time_t NextPingTime(); - /** Time of last ping used to calculate this->rtt below + /** Last ping time in milliseconds, 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 + */ + bool Hidden; /** True if the server answered their last ping */ @@ -106,62 +175,77 @@ class TreeServer : public classbase */ void SetPingFlag(); - /** Get the number of users on this server for MAP + /** Get the TreeSocket pointer for local servers. + * For remote servers, this returns NULL. */ - int GetUserCount(); + TreeSocket* GetSocket() const { return Socket; } - /** Increment the user counter + /** Get the parent server. + * For the root node, this returns NULL. */ - void AddUserCount(); + TreeServer* GetParent() const { return Parent; } - /** Decrement the user counter + /** Set the server version string */ - void DelUserCount(); + void SetVersion(const std::string& verstr) { VersionString = verstr; } - /** Get the oper count for this server + /** Set the full version string + * @param verstr The version string to set */ - int GetOperCount(); + void SetFullVersion(const std::string& verstr) { fullversion = verstr; } - /** Get the TreeSocket pointer for local servers. - * For remote servers, this returns NULL. + /** Sets the description of this server. Called when the description of a remote server changes + * and we are notified about it. + * @param descstr The description to set */ - TreeSocket* GetSocket(); + void SetDesc(const std::string& descstr) { description = descstr; } - /** Get the parent server. - * For the root node, this returns NULL. + /** Return all child servers */ - TreeServer* GetParent(); + const ChildServers& GetChildren() const { return Children; } - /** Set the server version string + /** Get server ID */ - void SetVersion(const std::string &Version); + const std::string& GetID() const { return sid; } - /** Return number of child servers + /** Marks a server as having finished bursting and performs appropriate actions. */ - unsigned int ChildCount(); + void FinishBurst(); + /** Recursive call for child servers */ + void FinishBurstInternal(); - /** Return a child server indexed 0..n + /** (Re)check the uline state of this server */ - TreeServer* GetChild(unsigned int n); + void CheckULine(); - /** Add a child server + /** Get the bursting state of this server + * @return True if this server is bursting, false if it isn't */ - void AddChild(TreeServer* Child); + bool IsBursting() const { return (StartBurst != 0); } - /** Delete a child server, return false if it didn't exist. + /** Check whether this server is behind a bursting server or is itself bursting. + * This can tell whether a user is on a part of the network that is still bursting. + * @return True if this server is bursting or is behind a server that is bursting, false if it isn't */ - bool DelChild(TreeServer* Child); + bool IsBehindBursting() const { return (behind_bursting != 0); } - /** Removes child nodes of this node, and of that node, etc etc. - * This is used during netsplits to automatically tidy up the - * server tree. It is slow, we don't use it for much else. + /** Set the bursting state of the server + * @param startms Time the server started bursting, if 0 or omitted, use current time */ - bool Tidy(); + void BeginBurst(unsigned long startms = 0); + + CullResult cull(); - /** Destructor + /** Destructor, deletes ServerUser unless IsRoot() */ ~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(user->server); + } }; - -#endif