X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommands%2Fcmd_whowas.h;h=0a38b44f16071c6ad9bd3e066a2fa3dc3b2f87fa;hb=92cc388aebd55245b24aef5950afe845feffe9e2;hp=5109ab54a3cab207a04bf6714d2b2ae2b3114550;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 5109ab54a..0a38b44f1 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -1,49 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 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 __CMD_WHOWAS_H__
-#define __CMD_WHOWAS_H__
-#include "modules.h"
-
-struct WhowasRequest : public Request
-{
-	/* list of available internal commands */
-	enum Internals
-	{
-		WHOWAS_ADD = 1,
-		WHOWAS_STATS = 2,
-		WHOWAS_PRUNE = 3,
-		WHOWAS_MAINTAIN = 4
-	};
-
-	const Internals type;
-	std::string value;
-	User* user;
 
-	WhowasRequest(Module* src, Module* whowas, Internals Type) : Request(src, whowas, "WHOWAS"), type(Type)
-	{}
-};
+#pragma once
 
-/* Forward ref for timer */
-class WhoWasMaintainTimer;
+#include "modules.h"
 
 /* Forward ref for typedefs */
 class WhoWasGroup;
 
-/** Timer that is used to maintain the whowas list, called once an hour
- */
-extern WhoWasMaintainTimer* timer;
-
 /** A group of users related by nickname
  */
 typedef std::deque<WhoWasGroup*> whowas_set;
@@ -64,19 +46,28 @@ typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
 class CommandWhowas : public Command
 {
   private:
-	/** Whowas container, contains a map of vectors of users tracked by WHOWAS
+	/** Primary container, links nicknames tracked by WHOWAS to a list of records
 	 */
 	whowas_users whowas;
 
-	/** Whowas container, contains a map of time_t to users tracked by WHOWAS
+	/** List of nicknames in the order they were inserted into the map
 	 */
 	whowas_users_fifo whowas_fifo;
 
-	/* String holding stats so it can be collected
+  public:
+	/** Max number of WhoWas entries per user.
 	 */
-	std::string stats;
+	unsigned int GroupSize;
+
+	/** Max number of cumulative user-entries in WhoWas.
+	 *  When max reached and added to, push out oldest entry FIFO style.
+	 */
+	unsigned int MaxGroups;
+
+	/** Max seconds a user is kept in WhoWas before being pruned.
+	 */
+	unsigned int MaxKeep;
 
-  public:
 	CommandWhowas(Module* parent);
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
@@ -87,14 +78,14 @@ class CommandWhowas : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 	void AddToWhoWas(User* user);
 	std::string GetStats();
-	void PruneWhoWas(time_t t);
-	void MaintainWhoWas(time_t t);
+	void Prune();
+	void Maintain();
 	~CommandWhowas();
 };
 
 /** Used to hold WHOWAS information
  */
-class WhoWasGroup : public classbase
+class WhoWasGroup
 {
  public:
 	/** Real host
@@ -108,7 +99,7 @@ class WhoWasGroup : public classbase
 	std::string ident;
 	/** Server name
 	 */
-	const char* server;
+	std::string server;
 	/** Fullname (GECOS)
 	 */
 	std::string gecos;
@@ -116,24 +107,7 @@ class WhoWasGroup : public classbase
 	 */
 	time_t signon;
 
-	/** Initialize this WhoQasFroup with a user
+	/** Initialize this WhoWasFroup with a user
 	 */
 	WhoWasGroup(User* user);
-	/** Destructor
-	 */
-	~WhoWasGroup();
 };
-
-class WhoWasMaintainTimer : public Timer
-{
-  private:
-	InspIRCd* ServerInstance;
-  public:
-	WhoWasMaintainTimer(InspIRCd* Instance, long interval)
-	: Timer(interval, Instance->Time(), true), ServerInstance(Instance)
-	{
-	}
-	virtual void Tick(time_t TIME);
-};
-
-#endif