fixes

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

diff --git a/include/bancache.h b/include/bancache.h
index 1edbbe5a11dfd578cf5fa2e4a175defd37e3fd9a..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,21 +14,42 @@
 #ifndef __BANCACHE_H
 #define __BANCACHE_H
 
-#include <string>
-
 class CoreExport BanCacheHit : public classbase
 {
  private:
+       InspIRCd *ServerInstance;
  public:
-       const std::string Type;
-       const std::string Reason;
-       const bool Banned;
-       const time_t Duration;
-       const time_t Creation;
-}
+       std::string Type;
+       std::string Reason;
+       std::string IP;
+       time_t Expiry;
+
+       BanCacheHit(InspIRCd *Instance, const std::string &ip, const std::string &type, const std::string &reason)
+       {
+               ServerInstance = Instance;
+               this->Type = type;
+               this->Reason = reason;
+               this->IP = ip;
+               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;
+       }
+};
 
 // must be defined after class BanCacheHit.
+#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<std::string, std::less<std::string> > > BanCacheHash;
+#endif
 
 class CoreExport BanCacheManager : public classbase
 {
@@ -36,14 +57,32 @@ class CoreExport BanCacheManager : public classbase
        BanCacheHash *BanHash;
        InspIRCd *ServerInstance;
  public:
-       BanCacheHit *AddHit(const std::string &ip, bool banned, const std::string &reason);
+
+       /** Creates and adds a Ban Cache item.
+        * @param ip The IP the item is for.
+        * @param type The type of ban cache item. std::string. .empty() means it's a negative match (user is allowed freely).
+        * @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);
+
+       /** Removes all entries of a given type, either positive or negative. Returns the number of hits removed.
+        * @param type The type of bancache entries to remove (e.g. 'G')
+        * @param positive Remove either positive (true) or negative (false) hits.
+        */
+       unsigned int RemoveEntries(const std::string &type, bool positive);
 
        BanCacheManager(InspIRCd *Instance)
        {
                this->ServerInstance = Instance;
                this->BanHash = new BanCacheHash();
        }
-}
+
+       void RehashCache();
+};
 
 #endif