X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbancache.h;h=7f51ca75e673e187dccf9d4089a3ac3b68aa27e9;hb=abc57eddfb56462ac3e433601d010abf1942e611;hp=9f74023369012bfd196004ee39f19d22f8158a10;hpb=c5d1a7843ed016c374b21242fccaca47e04b5a37;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/bancache.h b/include/bancache.h
index 9f7402336..7f51ca75e 100644
--- a/include/bancache.h
+++ b/include/bancache.h
@@ -18,8 +18,7 @@
  */
 
 
-#ifndef BANCACHE_H
-#define BANCACHE_H
+#pragma once
 
 /** Stores a cached ban entry.
  * Each ban has one of these hashed in a hash_map to make for faster removal
@@ -37,30 +36,30 @@ 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, time_t seconds)
-		: Type(type), Reason(reason), IP(ip), Expiry(ServerInstance->Time() + seconds)
+	BanCacheHit(const std::string &type, const std::string &reason, time_t seconds)
+		: Type(type), Reason(reason), Expiry(ServerInstance->Time() + seconds)
 	{
 	}
+
+	bool IsPositive() const { return (!Reason.empty()); }
 };
 
 /* A container of ban cache items.
  * must be defined after class BanCacheHit.
  */
-typedef std::tr1::unordered_map<std::string, BanCacheHit*, std::tr1::hash<std::string> > BanCacheHash;
+typedef TR1NS::unordered_map<std::string, BanCacheHit*, TR1NS::hash<std::string> > BanCacheHash;
 
 /** A manager for ban cache, which allocates and deallocates and checks cached bans.
  */
 class CoreExport BanCacheManager
 {
- private:
 	BanCacheHash* BanHash;
+	bool RemoveIfExpired(BanCacheHash::iterator& it);
+
  public:
 
 	/** Creates and adds a Ban Cache item.
@@ -71,20 +70,16 @@ class CoreExport BanCacheManager
 	 */
 	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()
 	{
 		this->BanHash = new BanCacheHash();
 	}
 	~BanCacheManager();
-	void RehashCache();
 };
-
-#endif