X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbancache.h;h=6e19e1ebe753d4afb0a3e309bb20e323782edfb7;hb=e0e1becc2f9129203966e69b2919582c11ab86f7;hp=ea09d389f25bd9ef267ec05dc027c5e9458bee07;hpb=2b1328c3f4b25a9f72cf2c458042ffafc2d5ad6b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/bancache.h b/include/bancache.h
index ea09d389f..6e19e1ebe 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
@@ -41,25 +40,22 @@ class CoreExport BanCacheHit
 	 */
 	time_t Expiry;
 
-	BanCacheHit(const std::string &type, const std::string &reason, time_t seconds)
-		: Type(type), Reason(reason), Expiry(ServerInstance->Time() + seconds)
-	{
-	}
+	BanCacheHit(const std::string& type, const std::string& reason, time_t 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;
-
 /** A manager for ban cache, which allocates and deallocates and checks cached bans.
  */
 class CoreExport BanCacheManager
 {
- private:
-	BanCacheHash* BanHash;
+	/** A container of ban cache items.
+	 */
+	typedef TR1NS::unordered_map<std::string, BanCacheHit*, TR1NS::hash<std::string> > BanCacheHash;
+
+	BanCacheHash BanHash;
+	bool RemoveIfExpired(BanCacheHash::iterator& it);
+
  public:
 
 	/** Creates and adds a Ban Cache item.
@@ -77,11 +73,5 @@ class CoreExport BanCacheManager
 	 */
 	void RemoveEntries(const std::string& type, bool positive);
 
-	BanCacheManager()
-	{
-		this->BanHash = new BanCacheHash();
-	}
 	~BanCacheManager();
 };
-
-#endif