* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* ---------------------------------------------------
*/
-/* $Core: libIRCDbancache */
+/* $Core */
#include "inspircd.h"
#include "bancache.h"
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;