X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbancache.cpp;h=af8626fe73c3772ce97e40b17dc0373ab42e763d;hb=c71361e8e4f22cb4f72881399bce2832eb080b0e;hp=c38a31b4dad7277321c672a82a697bd32e2af248;hpb=a0fdf5fcd51c18e9fa3be245349582e70b69f74f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/bancache.cpp b/src/bancache.cpp
index c38a31b4d..af8626fe7 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -1,8 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
  * 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
@@ -18,14 +22,18 @@
  */
 
 
-/* $Core */
-
 #include "inspircd.h"
-#include "bancache.h"
+
+BanCacheHit::BanCacheHit(const std::string& type, const std::string& reason, time_t seconds)
+	: Type(type)
+	, Reason(reason)
+	, Expiry(ServerInstance->Time() + seconds)
+{
+}
 
 BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
 {
-	BanCacheHit*& b = (*BanHash)[ip];
+	BanCacheHit*& b = BanHash[ip];
 	if (b != NULL) // can't have two cache entries on the same IP, sorry..
 		return NULL;
 
@@ -35,100 +43,68 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
 
 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!");
-			delete i->second;
-			BanHash->erase(i);
-			return NULL; // out of date
-		}
 
-		return i->second; // hit.
-	}
+	if (RemoveIfExpired(i))
+		return NULL; // expired
+
+	return i->second; // hit.
 }
 
-unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positive)
+bool BanCacheManager::RemoveIfExpired(BanCacheHash::iterator& it)
 {
-	int removed = 0;
+	if (ServerInstance->Time() < it->second->Expiry)
+		return false;
 
-	BanCacheHash::iterator safei;
+	ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "Hit on " + it->first + " is out of date, removing!");
+	delete it->second;
+	it = BanHash.erase(it);
+	return true;
+}
 
+void BanCacheManager::RemoveEntries(const std::string& type, bool positive)
+{
 	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 " + n->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.
-				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;
 }