BanCache: Simplify BanCacheManager::RemoveEntries()

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

diff --git a/include/bancache.h b/include/bancache.h
index a7aac7f17c8ed0e72beef72f4562b74243a6ea76..70ec09f0233ce0e5c84c05e4f0355e6a654132d3 100644 (file)
--- a/include/bancache.h
+++ b/include/bancache.h
@@ -37,35 +37,22 @@ class CoreExport BanCacheHit
        /** Reason, shown as quit message
         */
        std::string Reason;
-       /** IP to match against, no wildcards here (of course)
-        */
-       std::string IP;
        /** Time that the ban expires at
         */
        time_t Expiry;
 
-       BanCacheHit(const std::string &ip, const std::string &type, const std::string &reason)
+       BanCacheHit(const std::string &type, const std::string &reason, time_t seconds)
+               : Type(type), Reason(reason), Expiry(ServerInstance->Time() + seconds)
        {
-               this->Type = type;
-               this->Reason = reason;
-               this->IP = ip;
-               this->Expiry = ServerInstance->Time() + 86400; // a day. this might seem long, but entries will be removed as glines/etc expire.
        }
 
-       // overridden to allow custom time
-       BanCacheHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
-       {
-               this->Type = type;
-               this->Reason = reason;
-               this->IP = ip;
-               this->Expiry = ServerInstance->Time() + seconds;
-       }
+       bool IsPositive() const { return (!Reason.empty()); }
 };
 
 /* A container of ban cache items.
  * must be defined after class BanCacheHit.
  */
-typedef nspace::hash_map<std::string, BanCacheHit*, nspace::hash<std::string> > BanCacheHash;
+typedef std::tr1::unordered_map<std::string, BanCacheHit*, std::tr1::hash<std::string> > BanCacheHash;
 
 /** A manager for ban cache, which allocates and deallocates and checks cached bans.
  */
@@ -79,19 +66,16 @@ class CoreExport BanCacheManager
         * @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.
+        * @param seconds Number of seconds before nuking the bancache entry, the default is a day. This might seem long, but entries will be removed as glines/etc expire.
         */
-       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 *AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds = 0);
        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);
+       void RemoveEntries(const std::string& type, bool positive);
 
        BanCacheManager()
        {