mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-09 18:49:03 -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
171 lines
5.6 KiB
C++
171 lines
5.6 KiB
C++
/*
|
|
* InspIRCd -- Internet Relay Chat Daemon
|
|
*
|
|
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
|
|
* Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
|
|
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
|
|
* Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
|
|
* Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
|
|
* Copyright (C) 2006 William Pitcock <nenolod@dereferenced.org>
|
|
*
|
|
* 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 INSPIRCD_SOCKET_H
|
|
#define INSPIRCD_SOCKET_H
|
|
|
|
#ifndef _WIN32
|
|
|
|
#include <arpa/inet.h>
|
|
#include <sys/time.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/stat.h>
|
|
#include <netinet/in.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <netdb.h>
|
|
|
|
#else
|
|
|
|
#include "inspircd_win32wrapper.h"
|
|
|
|
#endif
|
|
|
|
#include <cerrno>
|
|
|
|
/* Contains irc-specific definitions */
|
|
namespace irc
|
|
{
|
|
/** This namespace contains various protocol-independent helper classes.
|
|
* It also contains some types which are often used by the core and modules
|
|
* in place of inet_* functions and types.
|
|
*/
|
|
namespace sockets
|
|
{
|
|
union CoreExport sockaddrs
|
|
{
|
|
struct sockaddr sa;
|
|
struct sockaddr_in in4;
|
|
struct sockaddr_in6 in6;
|
|
/** Return the size of the structure for syscall passing */
|
|
int sa_size() const;
|
|
/** Return port number or -1 if invalid */
|
|
int port() const;
|
|
/** Return IP only */
|
|
std::string addr() const;
|
|
/** Return human-readable IP/port pair */
|
|
std::string str() const;
|
|
bool operator==(const sockaddrs& other) const;
|
|
inline bool operator!=(const sockaddrs& other) const { return !(*this == other); }
|
|
};
|
|
|
|
struct CoreExport cidr_mask
|
|
{
|
|
/** Type, AF_INET or AF_INET6 */
|
|
unsigned char type;
|
|
/** Length of the mask in bits (0-128) */
|
|
unsigned char length;
|
|
/** Raw bits. Unused bits must be zero */
|
|
unsigned char bits[16];
|
|
|
|
cidr_mask() {}
|
|
/** Construct a CIDR mask from the string. Will normalize (127.0.0.1/8 => 127.0.0.0/8). */
|
|
cidr_mask(const std::string& mask);
|
|
/** Construct a CIDR mask of a given length from the given address */
|
|
cidr_mask(const irc::sockets::sockaddrs& addr, int len);
|
|
/** Equality of bits, type, and length */
|
|
bool operator==(const cidr_mask& other) const;
|
|
/** Ordering defined for maps */
|
|
bool operator<(const cidr_mask& other) const;
|
|
/** Match within this CIDR? */
|
|
bool match(const irc::sockets::sockaddrs& addr) const;
|
|
/** Human-readable string */
|
|
std::string str() const;
|
|
};
|
|
|
|
/** Match CIDR, including an optional username/nickname part.
|
|
*
|
|
* This function will compare a human-readable address (plus
|
|
* optional username and nickname) against a human-readable
|
|
* CIDR mask, for example joe!bloggs\@1.2.3.4 against
|
|
* *!bloggs\@1.2.0.0/16. This method supports both IPV4 and
|
|
* IPV6 addresses.
|
|
* @param address The human readable address, e.g. fred\@1.2.3.4
|
|
* @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16
|
|
* @param match_with_username Does the mask include a nickname segment?
|
|
* @return True if the mask matches the address
|
|
*/
|
|
CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username);
|
|
|
|
/** Return the size of the structure for syscall passing */
|
|
inline int sa_size(const irc::sockets::sockaddrs& sa) { return sa.sa_size(); }
|
|
|
|
/** Convert an address-port pair into a binary sockaddr
|
|
* @param addr The IP address, IPv4 or IPv6
|
|
* @param port The port, 0 for unspecified
|
|
* @param sa The structure to place the result in. Will be zeroed prior to conversion
|
|
* @return true if the conversion was successful, false if not.
|
|
*/
|
|
CoreExport bool aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa);
|
|
|
|
/** Convert a binary sockaddr to an address-port pair
|
|
* @param sa The structure to convert
|
|
* @param addr the IP address
|
|
* @param port the port
|
|
* @return true if the conversion was successful, false if unknown address family
|
|
*/
|
|
CoreExport bool satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port);
|
|
|
|
/** Convert a binary sockaddr to a user-readable string.
|
|
* This means IPv6 addresses are written as [::1]:6667, and *:6668 is used for 0.0.0.0:6668
|
|
* @param sa The structure to convert
|
|
* @return The string; "<unknown>" if not a valid address
|
|
*/
|
|
inline std::string satouser(const irc::sockets::sockaddrs& sa) { return sa.str(); }
|
|
}
|
|
}
|
|
|
|
#include "socketengine.h"
|
|
/** This class handles incoming connections on client ports.
|
|
* It will create a new User for every valid connection
|
|
* and assign it a file descriptor.
|
|
*/
|
|
class CoreExport ListenSocket : public EventHandler
|
|
{
|
|
public:
|
|
reference<ConfigTag> bind_tag;
|
|
std::string bind_addr;
|
|
int bind_port;
|
|
/** Human-readable bind description */
|
|
std::string bind_desc;
|
|
/** Create a new listening socket
|
|
*/
|
|
ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to);
|
|
/** Handle an I/O event
|
|
*/
|
|
void HandleEvent(EventType et, int errornum = 0);
|
|
/** Close the socket
|
|
*/
|
|
~ListenSocket();
|
|
|
|
/** Handles sockets internals crap of a connection, convenience wrapper really
|
|
*/
|
|
void AcceptInternal();
|
|
};
|
|
|
|
#endif
|
|
|