X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbancache.cpp;h=13e4dc7c708266547c12be9d519b7d6d868bc390;hb=caa0c27a5a485151a0de21e700680c1e46ab85b4;hp=5106e7270252813ffdbda38f0f4a7f04c74e44ee;hpb=a5fe50aca04ca554d313e7361c571c6a497a9c4e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/bancache.cpp b/src/bancache.cpp
index 5106e7270..13e4dc7c7 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -18,14 +18,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,9 +39,9 @@ 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
 
 	if (RemoveIfExpired(i))
@@ -53,7 +57,7 @@ bool BanCacheManager::RemoveIfExpired(BanCacheHash::iterator& it)
 
 	ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "Hit on " + it->first + " is out of date, removing!");
 	delete it->second;
-	it = BanHash->erase(it);
+	it = BanHash.erase(it);
 	return true;
 }
 
@@ -64,7 +68,7 @@ void BanCacheManager::RemoveEntries(const std::string& type, bool positive)
 	else
 		ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing all negative hits");
 
-	for (BanCacheHash::iterator i = BanHash->begin(); i != BanHash->end(); )
+	for (BanCacheHash::iterator i = BanHash.begin(); i != BanHash.end(); )
 	{
 		if (RemoveIfExpired(i))
 			continue; // updates the iterator if expired
@@ -88,7 +92,7 @@ void BanCacheManager::RemoveEntries(const std::string& type, bool positive)
 			/* we need to remove this one. */
 			ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + i->first);
 			delete b;
-			i = BanHash->erase(i);
+			i = BanHash.erase(i);
 		}
 		else
 			++i;
@@ -97,7 +101,6 @@ void BanCacheManager::RemoveEntries(const std::string& type, bool positive)
 
 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;
 }