* | 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.
* ---------------------------------------------------
*/
-/* $Core: libIRCDbancache */
+/* $Core */
#include "inspircd.h"
#include "bancache.h"
{
BanCacheHit *b;
-
if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
return NULL;
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);
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)
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
{
return true;
}
-int BanCacheManager::RemoveEntries(const std::string &type, bool positive)
+unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positive)
{
- return 0;
+ 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;
+ safei++;
+
+ BanCacheHit *b = n->second;
+
+ /* Safe to delete items here through iterator 'n' */
+ 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); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way.
+ removed++;
+ }
+ }
+
+ /* End of safe section */
+ n = safei;
+ }
+
+
+ return removed;
}
void BanCacheManager::RehashCache()
safei++;
/* Safe to delete items here through iterator 'n' */
-
- /* Actually inserts a std::pair */
- NewHash->insert(*n);
+ BanCacheHit *b = n->second;
+
+ 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 */