X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbancache.cpp;h=524baaad2e4805471a53ccf1030259c8c4ce8113;hb=c71801ebc4577b19e604c0d91a95fdcfe5250cc9;hp=05c014de334a1e29f1676ba195d1569dc0fe121e;hpb=12ec2bc108e0f0219792cbbe78a6ce7d86818fe3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/bancache.cpp b/src/bancache.cpp
index 05c014de3..524baaad2 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDbancache */
+/* $Core */
 
 #include "inspircd.h"
 #include "bancache.h"
@@ -20,7 +20,6 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
 {
 	BanCacheHit *b;
 
-
 	if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
 		return NULL;
 
@@ -30,6 +29,19 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
 	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(ServerInstance, ip, type, reason, seconds);
+
+	this->BanHash->insert(std::make_pair(ip, b));
+	return b;
+}
+
 BanCacheHit *BanCacheManager::GetHit(const std::string &ip)
 {
 	BanCacheHash::iterator i = this->BanHash->find(ip);
@@ -37,7 +49,16 @@ BanCacheHit *BanCacheManager::GetHit(const std::string &ip)
 	if (i == this->BanHash->end())
 		return NULL; // free and safe
 	else
+	{
+		if (ServerInstance->Time() > i->second->Expiry)
+		{
+			ServerInstance->Logs->Log("BANCACHE", DEBUG, "Hit on " + ip + " is out of date, removing!");
+			RemoveHit(i->second);
+			return NULL; // out of date
+		}
+
 		return i->second; // hit.
+	}
 }
 
 bool BanCacheManager::RemoveHit(BanCacheHit *b)
@@ -52,7 +73,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
 	{
@@ -63,12 +84,17 @@ bool BanCacheManager::RemoveHit(BanCacheHit *b)
 	return true;
 }
 
-int BanCacheManager::RemoveEntries(const std::string &type, bool positive)
+unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positive)
 {
 	int removed = 0;
 
 	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;
@@ -77,14 +103,15 @@ int BanCacheManager::RemoveEntries(const std::string &type, bool positive)
 		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()) || b->Reason.empty())
 			{
 				/* 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);
+				BanHash->erase(n); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way.
 				removed++;
 			}
 		}
@@ -108,9 +135,20 @@ void BanCacheManager::RehashCache()
 		safei++;
 
 		/* Safe to delete items here through iterator 'n' */
+		BanCacheHit *b = n->second;
 
-		/* Actually inserts a std::pair */
-		NewHash->insert(*n);
+		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
+		{
+			/* Actually inserts a std::pair */
+			NewHash->insert(*n);
+		}
 
 		/* End of safe section */