X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbancache.cpp;h=52449e55e86d7995e34998a92a511547efc96ff9;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=826244b55bc2cddf89c40394f3bcee4f3f35d21e;hpb=1200d6285b1d64699c6fa2c8241e2ee40f52d2a3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/bancache.cpp b/src/bancache.cpp
index 826244b55..52449e55e 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | 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) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   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/>.
  */
 
+
 /* $Core */
 
 #include "inspircd.h"
@@ -23,7 +30,7 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
 	if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
 		return NULL;
 
-	b = new BanCacheHit(ServerInstance, ip, type, reason);
+	b = new BanCacheHit(ip, type, reason);
 
 	this->BanHash->insert(std::make_pair(ip, b));
 	return b;
@@ -36,7 +43,7 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
 	if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
 		return NULL;
 
-	b = new BanCacheHit(ServerInstance, ip, type, reason, seconds);
+	b = new BanCacheHit(ip, type, reason, seconds);
 
 	this->BanHash->insert(std::make_pair(ip, b));
 	return b;
@@ -50,7 +57,7 @@ BanCacheHit *BanCacheManager::GetHit(const std::string &ip)
 		return NULL; // free and safe
 	else
 	{
-		if (time(NULL) > i->second->Expiry)
+		if (ServerInstance->Time() > i->second->Expiry)
 		{
 			ServerInstance->Logs->Log("BANCACHE", DEBUG, "Hit on " + ip + " is out of date, removing!");
 			RemoveHit(i->second);
@@ -110,7 +117,6 @@ unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positi
 				/* we need to remove this one. */
 				ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + b->IP);
 				delete b;
-				b = NULL;
 				BanHash->erase(n); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way.
 				removed++;
 			}
@@ -137,11 +143,10 @@ void BanCacheManager::RehashCache()
 		/* Safe to delete items here through iterator 'n' */
 		BanCacheHit *b = n->second;
 
-		if (time(NULL) > b->Expiry)
+		if (ServerInstance->Time() > b->Expiry)
 		{
 			/* we need to remove this one. */
 			delete b;
-			b = NULL;
 			BanHash->erase(n); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way.
 		}
 		else
@@ -158,3 +163,10 @@ void BanCacheManager::RehashCache()
 	delete BanHash;
 	BanHash = NewHash;
 }
+
+BanCacheManager::~BanCacheManager()
+{
+	for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); ++n)
+		delete n->second;
+	delete BanHash;
+}