X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=3abbeef32a1054135cf741d5253600e0174b6b92;hb=f2dcf19923c4b60b268899c93b8deb3e6f30c6fe;hp=7fa58f8ad992bfe444fafe3bd9d618a7dabd2a16;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index 7fa58f8ad..3abbeef32 100644 --- a/include/socket.h +++ b/include/socket.h @@ -22,10 +22,9 @@ */ -#ifndef INSPIRCD_SOCKET_H -#define INSPIRCD_SOCKET_H +#pragma once -#ifndef WIN32 +#ifndef _WIN32 #include #include @@ -105,13 +104,11 @@ namespace irc * 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 @@ -145,7 +142,7 @@ namespace irc class CoreExport ListenSocket : public EventHandler { public: - const reference bind_tag; + reference bind_tag; std::string bind_addr; int bind_port; /** Human-readable bind description */ @@ -164,6 +161,3 @@ class CoreExport ListenSocket : public EventHandler */ void AcceptInternal(); }; - -#endif -