Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / bancache.cpp

diff --git a/src/bancache.cpp b/src/bancache.cpp
index e8accb40486be5ae792ddf8013d172e42dd34702..0ca2d693f1030f470cbb9ed2f9945ce10ba82d79 100644 (file)
--- 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"
@@ -23,7 +23,20 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
        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);
+       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..
+               return NULL;
+
+       b = new BanCacheHit(ip, type, reason, seconds);
 
        this->BanHash->insert(std::make_pair(ip, b));
        return b;
@@ -37,9 +50,9 @@ BanCacheHit *BanCacheManager::GetHit(const std::string &ip)
                return NULL; // free and safe
        else
        {
-               if (time(NULL) > i->second->Expiry)
+               if (ServerInstance->Time() > i->second->Expiry)
                {
-                       ServerInstance->Log(DEBUG, "Hit on " + ip + " is out of date, removing!");
+                       ServerInstance->Logs->Log("BANCACHE", DEBUG, "Hit on " + ip + " is out of date, removing!");
                        RemoveHit(i->second);
                        return NULL; // out of date
                }
@@ -60,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
        {
@@ -77,6 +90,11 @@ unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positi
 
        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;
@@ -85,12 +103,12 @@ unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positi
                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()) || !positive && b->Reason.empty())
+                       if ((positive && !b->Reason.empty()) || b->Reason.empty())
                        {
                                /* we need to remove this one. */
-                               ServerInstance->Log(DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + b->IP);
+                               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.
@@ -119,7 +137,7 @@ void BanCacheManager::RehashCache()
                /* Safe to delete items here through iterator 'n' */
                BanCacheHit *b = n->second;
 
-               if (time(NULL) > b->Expiry)
+               if (ServerInstance->Time() > b->Expiry)
                {
                        /* we need to remove this one. */
                        delete b;