X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbancache.cpp;h=52449e55e86d7995e34998a92a511547efc96ff9;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=e8accb40486be5ae792ddf8013d172e42dd34702;hpb=64fec23cc76f86650860a24e5dae1d49e27f9111;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/bancache.cpp b/src/bancache.cpp
index e8accb404..52449e55e 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -1,17 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 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: libIRCDbancache */
+
+/* $Core */
 
 #include "inspircd.h"
 #include "bancache.h"
@@ -23,7 +30,20 @@ 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;
+}
+
+BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
+{
+	BanCacheHit *b;
+
+	if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
+		return NULL;
+
+	b = new BanCacheHit(ip, type, reason, seconds);
 
 	this->BanHash->insert(std::make_pair(ip, b));
 	return b;
@@ -37,9 +57,9 @@ 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->Log(DEBUG, "Hit on " + ip + " is out of date, removing!");
+			ServerInstance->Logs->Log("BANCACHE", DEBUG, "Hit on " + ip + " is out of date, removing!");
 			RemoveHit(i->second);
 			return NULL; // out of date
 		}
@@ -60,7 +80,7 @@ bool BanCacheManager::RemoveHit(BanCacheHit *b)
 	if (i == this->BanHash->end())
 	{
 		// err..
-		ServerInstance->Log(DEBUG, "BanCacheManager::RemoveHit(): I got asked to remove a hit that wasn't in the hash(?)");
+		ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveHit(): I got asked to remove a hit that wasn't in the hash(?)");
 	}
 	else
 	{
@@ -77,6 +97,11 @@ unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positi
 
 	BanCacheHash::iterator safei;
 
+	if (positive)
+		ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveEntries(): Removing positive hits for " + type);
+	else
+		ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveEntries(): Removing negative hits for " + type);
+
 	for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); )
 	{
 		safei = n;
@@ -85,14 +110,13 @@ unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positi
 		BanCacheHit *b = n->second;
 
 		/* Safe to delete items here through iterator 'n' */
-		if (b->Type == type)
+		if (b->Type == type || !positive) // if removing negative hits, ignore type..
 		{
-			if ((positive && !b->Reason.empty()) || !positive && b->Reason.empty())
+			if ((positive && !b->Reason.empty()) || b->Reason.empty())
 			{
 				/* we need to remove this one. */
-				ServerInstance->Log(DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + b->IP);
+				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++;
 			}
@@ -119,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
@@ -140,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;
+}