X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=943267cfdda742bdec1b37e11394a4b5703a0f4e;hb=bd2236348ab57ddb358c770002b75291e2f931bd;hp=95b7469f963840c06cef6cadd66f0148f3d71c8c;hpb=d1bfdcb61347264fbef6656de88ab6e30d9fc617;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 95b7469f9..943267cfd 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -1,18 +1,28 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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__
+
+#ifndef M_SPANNINGTREE_TREESERVER_H
+#define M_SPANNINGTREE_TREESERVER_H
+
+#include "treesocket.h"
 
 /** Each server in the tree is represented by one class of
  * type TreeServer. A locally connected TreeServer can
@@ -30,7 +40,6 @@
  */
 class TreeServer : public classbase
 {
-	InspIRCd* ServerInstance;		/* Creator */
 	TreeServer* Parent;			/* Parent entry */
 	TreeServer* Route;			/* Route entry */
 	std::vector<TreeServer*> Children;	/* List of child objects */
@@ -52,26 +61,23 @@ class TreeServer : public classbase
 	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, const std::string &id);
-
 	/** 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);
+	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, const std::string &id, 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);
 
@@ -113,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;
 
@@ -199,10 +205,10 @@ class TreeServer : public classbase
 	/** Recursive call for child servers */
 	void FinishBurstInternal();
 
+	CullResult cull();
 	/** Destructor
 	 */
 	~TreeServer();
-
 };
 
 #endif