Merge commit 'refs/merge-requests/5' of git://gitorious.org/inspircd/inspircd into...

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

diff --git a/src/bancache.cpp b/src/bancache.cpp
index 826244b55bc2cddf89c40394f3bcee4f3f35d21e..240be38cb8e4c1aeaf6570c981ffd43fa85a95c4 100644 (file)
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -23,7 +23,7 @@ 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;
@@ -36,7 +36,7 @@ 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, seconds);
+       b = new BanCacheHit(ip, type, reason, seconds);
 
        this->BanHash->insert(std::make_pair(ip, b));
        return b;
@@ -50,7 +50,7 @@ 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->Logs->Log("BANCACHE", DEBUG, "Hit on " + ip + " is out of date, removing!");
                        RemoveHit(i->second);
@@ -137,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;
@@ -158,3 +158,10 @@ void BanCacheManager::RehashCache()
        delete BanHash;
        BanHash = NewHash;
 }
+
+BanCacheManager::~BanCacheManager()
+{
+       for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); ++n)
+               delete n->second;
+       delete BanHash;
+}