mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-10 02:59:01 -04:00
-Fix x64 builds for Windows. Now all configurations compile. -Remove the non-working rebase stuff. -Remove the Windows fork hack and instead use FreeConsole() to emulate the behavior. This directly allows us to compile with ASLR, which is turned on now. -Remove the old IPC mechanism for the removed GUI. This is not needed anymore as the GUI wasn't ever supported on anything newer than 1.2 -Remove the WIN32/WINDOWS macros. _WIN32 is supported on all x86-based VC++ targets, so that's what we need. -Enable optimizations for release builds. -De-duplicate printf_c(), it was previously copy-pasted into colors.h for configure -Add the VC++ specific bad files in .gitignore -Disable PID writing on Windows. This is only making sense for *nix builds. -Replace the CPU usage retrieval with an algorithm analogous to the *nix behavior. Also supports separated now/total values. (Tested with a dummy busy loop - seems working) -Removed certain unused functions and variables -Remove stdint defines from the windows wrapper -Remove CRT debug alloc. This is a bad idea as it would define a macro to replace free which breaks builds. -Re-evaluated the warnings list, commented it. -Moved inspircd_config/_version to include/ to match *nix -Removed the creation of inspircd_se_config, as it isn't used at all. -Made non-git builds show as "r0" instead of "r" (thanks to @SaberUK for pointing this out) -Fixed up m_spanningtree's project paths. Now all configurations (debug/release x86/x64) have been tested and build properly. -Moved FindDNS out of the wrapper and matched its log behavior with *nix. (It's pointless having it in the wrapper after the recent slimming down) -Replaced random/srandom wrappers with a mechanism that tries to use Windows' Random API first is no SSL module is loaded. -Removed more old junk from support for compilers older than VC++ 2010 (we don't have project files for these, so compiling them would be hard anyways) -Removed the unused ClearConsole() -Removed unused includes from the wrapper. Also, do not include psapi.h here if we don't link psapi.lib. This should be done where appropriate. -Made inet_aton an inline function for increased performance -C4800, performance warning about bool forcing, resolved at all occurrences. -C4701, uninitialized variable 'cached', resolved at all occurrences. -dlerror() was migrated out of the wrapper for more thread safety (no global buffer being shared) and increased performance. -Removed the wrong CRT debug flags. This drains a lot of performance. -Removed the clock_gettime/gettimeofday wrappers -Replaced all TCHAR/ANSI mix-ups of functions with the correct respective function. -Added a block of C4355 for < VS2012 -Update project files for c870714
105 lines
3.4 KiB
C++
105 lines
3.4 KiB
C++
/*
|
|
* InspIRCd -- Internet Relay Chat Daemon
|
|
*
|
|
* Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
|
|
* Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
|
|
*
|
|
* 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/>.
|
|
*/
|
|
|
|
|
|
#ifndef BANCACHE_H
|
|
#define BANCACHE_H
|
|
|
|
/** Stores a cached ban entry.
|
|
* Each ban has one of these hashed in a hash_map to make for faster removal
|
|
* of already-banned users in the case that they try to reconnect. As no wildcard
|
|
* matching is done on these IPs, the speed of the system is improved. These cache
|
|
* entries expire every few hours, which is a reasonable expiry for any reasonable
|
|
* sized network.
|
|
*/
|
|
class CoreExport BanCacheHit
|
|
{
|
|
public:
|
|
/** Type of cached ban
|
|
*/
|
|
std::string Type;
|
|
/** 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)
|
|
{
|
|
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;
|
|
}
|
|
};
|
|
|
|
/* A container of ban cache items.
|
|
* must be defined after class BanCacheHit.
|
|
*/
|
|
typedef nspace::hash_map<std::string, BanCacheHit*, nspace::hash<std::string> > BanCacheHash;
|
|
|
|
/** A manager for ban cache, which allocates and deallocates and checks cached bans.
|
|
*/
|
|
class CoreExport BanCacheManager
|
|
{
|
|
private:
|
|
BanCacheHash* BanHash;
|
|
public:
|
|
|
|
/** Creates and adds a Ban Cache item.
|
|
* @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.
|
|
*/
|
|
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 *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);
|
|
|
|
BanCacheManager()
|
|
{
|
|
this->BanHash = new BanCacheHash();
|
|
}
|
|
~BanCacheManager();
|
|
void RehashCache();
|
|
};
|
|
|
|
#endif
|