X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=460231502a76c532a7da5ff9567ed848882a9ab2;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=9520506ae8f57d3e089ddd26003cbabfa8eb6f40;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 9520506ae..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-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
-#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
@@ -36,8 +45,6 @@ class TreeServer : public classbase
 	irc::string ServerName;			/* Server's name */
 	std::string ServerDesc;			/* Server's description */
 	std::string VersionString;		/* Version string or empty string */
-	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 */
@@ -57,6 +64,9 @@ class TreeServer : public classbase
 	bool Warned;				/* True if we've warned opers about high latency on this server */
 	bool bursting;				/* whether or not this server is bursting */
 
+	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.
@@ -95,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
 	 */
@@ -109,7 +119,7 @@ class TreeServer : public classbase
 	 */
 	time_t NextPingTime();
 
-	/** 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;
 
@@ -133,22 +143,6 @@ class TreeServer : public classbase
 	 */
 	void SetPingFlag();
 
-	/** Get the number of users on this server.
-	 */
-	unsigned int GetUserCount();
-
-	/** Increment or decrement the user count by diff.
-	 */
-	void SetUserCount(int diff);
-
-	/** Gets the numbers of opers on this server.
-	 */
-	unsigned int GetOperCount();
-
-	/** Increment or decrement the oper count by diff.
-	 */
-	void SetOperCount(int diff);
-
 	/** Get the TreeSocket pointer for local servers.
 	 * For remote servers, this returns NULL.
 	 */
@@ -187,7 +181,7 @@ class TreeServer : public classbase
 
 	/** Get server ID
 	 */
-	std::string& GetID();
+	const std::string& GetID();
 
 	/** Marks a server as having finished bursting and performs appropriate actions.
 	 */
@@ -200,5 +194,3 @@ class TreeServer : public classbase
 	 */
 	~TreeServer();
 };
-
-#endif