-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* $Core: libIRCDbancache */
+
+/* $Core */
#include "inspircd.h"
#include "bancache.h"
if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
return NULL;
- b = new BanCacheHit(ServerInstance, ip, type, reason);
+ b = new BanCacheHit(ip, type, reason);
+
+ this->BanHash->insert(std::make_pair(ip, b));
+ return b;
+}
+
+BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
+{
+ BanCacheHit *b;
+
+ if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
+ return NULL;
+
+ b = new BanCacheHit(ip, type, reason, seconds);
this->BanHash->insert(std::make_pair(ip, b));
return b;
return NULL; // free and safe
else
{
- if (time(NULL) > i->second->Expiry)
+ if (ServerInstance->Time() > i->second->Expiry)
{
- ServerInstance->Log(DEBUG, "Hit on " + ip + " is out of date, removing!");
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, "Hit on " + ip + " is out of date, removing!");
RemoveHit(i->second);
return NULL; // out of date
}
if (i == this->BanHash->end())
{
// err..
- ServerInstance->Log(DEBUG, "BanCacheManager::RemoveHit(): I got asked to remove a hit that wasn't in the hash(?)");
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveHit(): I got asked to remove a hit that wasn't in the hash(?)");
}
else
{
BanCacheHash::iterator safei;
if (positive)
- ServerInstance->Log(DEBUG, "BanCacheManager::RemoveEntries(): Removing positive hits for " + type);
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveEntries(): Removing positive hits for " + type);
else
- ServerInstance->Log(DEBUG, "BanCacheManager::RemoveEntries(): Removing negative hits for " + type);
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveEntries(): Removing negative hits for " + type);
for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); )
{
if ((positive && !b->Reason.empty()) || b->Reason.empty())
{
/* we need to remove this one. */
- ServerInstance->Log(DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + b->IP);
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + b->IP);
delete b;
b = NULL;
BanHash->erase(n); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way.
/* Safe to delete items here through iterator 'n' */
BanCacheHit *b = n->second;
- if (time(NULL) > b->Expiry)
+ if (ServerInstance->Time() > b->Expiry)
{
/* we need to remove this one. */
delete b;
delete BanHash;
BanHash = NewHash;
}
+
+BanCacheManager::~BanCacheManager()
+{
+ for (BanCacheHash::iterator n = BanHash->begin(); n != BanHash->end(); ++n)
+ delete n->second;
+ delete BanHash;
+}