X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbancache.h;h=d2ec5284a6055c262ab50f3348a6bb3e8c1d27f0;hb=e3e7cb89e112bbeed2b3e43798a16fe557a3992a;hp=b6e037f79dde8e955c3f5e99cceba6b2c75277ae;hpb=1200d6285b1d64699c6fa2c8241e2ee40f52d2a3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/bancache.h b/include/bancache.h
index b6e037f79..d2ec5284a 100644
--- a/include/bancache.h
+++ b/include/bancache.h
@@ -1,18 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * 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 __BANCACHE_H
-#define __BANCACHE_H
+
+#ifndef BANCACHE_H
+#define BANCACHE_H
 
 /** Stores a cached ban entry.
  * Each ban has one of these hashed in a hash_map to make for faster removal
@@ -21,10 +28,8 @@
  * entries expire every few hours, which is a reasonable expiry for any reasonable
  * sized network.
  */
-class CoreExport BanCacheHit : public classbase
+class CoreExport BanCacheHit
 {
- private:
-	InspIRCd *ServerInstance;
  public:
 	/** Type of cached ban
 	 */
@@ -39,42 +44,39 @@ class CoreExport BanCacheHit : public classbase
 	 */
 	time_t Expiry;
 
-	BanCacheHit(InspIRCd *Instance, const std::string &ip, const std::string &type, const std::string &reason)
+	BanCacheHit(const std::string &ip, const std::string &type, const std::string &reason)
 	{
-		ServerInstance = Instance;
 		this->Type = type;
 		this->Reason = reason;
 		this->IP = ip;
-		this->Expiry = time(NULL) + 86400; // a day. this might seem long, but entries will be removed as glines/etc expire.
+		this->Expiry = ServerInstance->Time() + 86400; // a day. this might seem long, but entries will be removed as glines/etc expire.
 	}
 
 	// overridden to allow custom time
-	BanCacheHit(InspIRCd *Instance, const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
+	BanCacheHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
 	{
-		ServerInstance = Instance;
 		this->Type = type;
 		this->Reason = reason;
 		this->IP = ip;
-		this->Expiry = time(NULL) + seconds;
+		this->Expiry = ServerInstance->Time() + seconds;
 	}
 };
 
 /* A container of ban cache items.
  * must be defined after class BanCacheHit.
  */
-#ifndef WIN32
-typedef nspace::hash_map<std::string, BanCacheHit*, nspace::hash<std::string> > BanCacheHash;
-#else
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
 typedef nspace::hash_map<std::string, BanCacheHit*, nspace::hash_compare<std::string, std::less<std::string> > > BanCacheHash;
+#else
+typedef nspace::hash_map<std::string, BanCacheHit*, nspace::hash<std::string> > BanCacheHash;
 #endif
 
 /** A manager for ban cache, which allocates and deallocates and checks cached bans.
  */
-class CoreExport BanCacheManager : public classbase
+class CoreExport BanCacheManager
 {
  private:
 	BanCacheHash* BanHash;
-	InspIRCd* ServerInstance;
  public:
 
 	/** Creates and adds a Ban Cache item.
@@ -95,12 +97,11 @@ class CoreExport BanCacheManager : public classbase
 	 */
 	unsigned int RemoveEntries(const std::string &type, bool positive);
 
-	BanCacheManager(InspIRCd *Instance)
+	BanCacheManager()
 	{
-		this->ServerInstance = Instance;
 		this->BanHash = new BanCacheHash();
 	}
-
+	~BanCacheManager();
 	void RehashCache();
 };