fixes

[user/henk/code/inspircd.git] / include / bancache.h

diff --git a/include/bancache.h b/include/bancache.h
index 75d1a67b5b765e93a748c6a6de88a495e764cf21..944d69816e5450d19d1de264a8ac5a8e81d0bf9a 100644 (file)
--- a/include/bancache.h
+++ b/include/bancache.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,8 +14,6 @@
 #ifndef __BANCACHE_H
 #define __BANCACHE_H
 
-#include <string>
-
 class CoreExport BanCacheHit : public classbase
 {
  private:
@@ -32,7 +30,17 @@ class CoreExport BanCacheHit : public classbase
                this->Type = type;
                this->Reason = reason;
                this->IP = ip;
-               this->Expiry = time(NULL) + 60; // XXX changeme
+               this->Expiry = time(NULL) + 86400; // a day. this might seem long, but entries will be removed as glines/etc expire.
+       }
+
+       // overridden to allow custom time
+       BanCacheHit(InspIRCd *Instance, const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
+       {
+               ServerInstance = Instance;
+               this->Type = type;
+               this->Reason = reason;
+               this->IP = ip;
+               this->Expiry = time(NULL) + seconds;
        }
 };
 
@@ -40,7 +48,7 @@ class CoreExport BanCacheHit : public classbase
 #ifndef WIN32
 typedef nspace::hash_map<std::string, BanCacheHit *, nspace::hash<std::string> > BanCacheHash;
 #else
-typedef nspace::hash_map<std::string, BanCacheHit*, nspace::hash_compare<string, less<string> > > BanCacheHash;
+typedef nspace::hash_map<std::string, BanCacheHit*, nspace::hash_compare<std::string, std::less<std::string> > > BanCacheHash;
 #endif
 
 class CoreExport BanCacheManager : public classbase
@@ -56,6 +64,9 @@ class CoreExport BanCacheManager : public classbase
         * @param reason The reason for the ban. Left .empty() if it's a negative match.
         */
        BanCacheHit *AddHit(const std::string &ip, const std::string &type, const std::string &reason);
+
+       // Overridden to allow an optional number of seconds before expiry
+       BanCacheHit *AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds);
        BanCacheHit *GetHit(const std::string &ip);
        bool RemoveHit(BanCacheHit *b);