1 files changed, 40 insertions, 106 deletions

diff --git a/src/bancache.cpp b/src/bancache.cpp
index 52449e55e..13e4dc7c7 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -18,155 +18,89 @@
  */
 
 
-/* $Core */
-
 #include "inspircd.h"
-#include "bancache.h"
 
-BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &type, const std::string &reason)
+BanCacheHit::BanCacheHit(const std::string& type, const std::string& reason, time_t seconds)
+	: Type(type)
+	, Reason(reason)
+	, Expiry(ServerInstance->Time() + 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);
-
-	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..
+	BanCacheHit*& b = BanHash[ip];
+	if (b != NULL) // 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));
+	b = new BanCacheHit(type, reason, (seconds ? seconds : 86400));
 	return b;
 }
 
 BanCacheHit *BanCacheManager::GetHit(const std::string &ip)
 {
-	BanCacheHash::iterator i = this->BanHash->find(ip);
+	BanCacheHash::iterator i = this->BanHash.find(ip);
 
-	if (i == this->BanHash->end())
+	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.
-	}
+	if (RemoveIfExpired(i))
+		return NULL; // expired
+
+	return i->second; // hit.
 }
 
-bool BanCacheManager::RemoveHit(BanCacheHit *b)
+bool BanCacheManager::RemoveIfExpired(BanCacheHash::iterator& it)
 {
-	BanCacheHash::iterator i;
-
-	if (!b)
-		return false; // I don't think so.
-
-	i = this->BanHash->find(b->IP);
-
-	if (i == this->BanHash->end())
-	{
-		// err..
-		ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveHit(): I got asked to remove a hit that wasn't in the hash(?)");
-	}
-	else
-	{
-		this->BanHash->erase(i);
-	}
+	if (ServerInstance->Time() < it->second->Expiry)
+		return false;
 
-	delete b;
+	ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "Hit on " + it->first + " is out of date, removing!");
+	delete it->second;
+	it = BanHash.erase(it);
 	return true;
 }
 
-unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positive)
+void 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);
+		ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing positive hits for " + type);
 	else
-		ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveEntries(): Removing negative hits for " + type);
+		ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing all negative hits");
 
-	for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); )
+	for (BanCacheHash::iterator i = BanHash.begin(); i != BanHash.end(); )
 	{
-		safei = n;
-		safei++;
+		if (RemoveIfExpired(i))
+			continue; // updates the iterator if expired
 
-		BanCacheHit *b = n->second;
+		BanCacheHit* b = i->second;
+		bool remove = false;
 
-		/* Safe to delete items here through iterator 'n' */
-		if (b->Type == type || !positive) // if removing negative hits, ignore type..
+		if (positive)
 		{
-			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;
-				BanHash->erase(n); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way.
-				removed++;
-			}
+			// when removing positive hits, remove only if the type matches
+			remove = b->IsPositive() && (b->Type == type);
+		}
+		else
+		{
+			// when removing negative hits, remove all of them
+			remove = !b->IsPositive();
 		}
 
-		/* End of safe section */
-		n = safei;
-	}
-
-
-	return removed;
-}
-
-void BanCacheManager::RehashCache()
-{
-	BanCacheHash* NewHash = new BanCacheHash();
-
-	BanCacheHash::iterator safei;
-	for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); )
-	{
-		safei = n;
-		safei++;
-
-		/* Safe to delete items here through iterator 'n' */
-		BanCacheHit *b = n->second;
-
-		if (ServerInstance->Time() > b->Expiry)
+		if (remove)
 		{
 			/* we need to remove this one. */
+			ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + i->first);
 			delete b;
-			BanHash->erase(n); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way.
+			i = BanHash.erase(i);
 		}
 		else
-		{
-			/* Actually inserts a std::pair */
-			NewHash->insert(*n);
-		}
-
-		/* End of safe section */
-
-		n = safei;
+			++i;
 	}
-
-	delete BanHash;
-	BanHash = NewHash;
 }
 
 BanCacheManager::~BanCacheManager()
 {
-	for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); ++n)
+	for (BanCacheHash::iterator n = BanHash.begin(); n != BanHash.end(); ++n)
 		delete n->second;
-	delete BanHash;
 }