X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fsocket.h;h=b09581cd600a0935e66f833b0946bd92adc47dd2;hb=d383ce9b72bf5c58bb0571998b282cf67cf7635c;hp=92cd57130af1cea54de5865b822692b762448ee7;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index 92cd57130..b09581cd6 100644 --- a/include/socket.h +++ b/include/socket.h @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * @@ -17,6 +14,8 @@ #ifndef INSPIRCD_SOCKET_H #define INSPIRCD_SOCKET_H +#ifndef WIN32 + #include #include #include @@ -26,46 +25,134 @@ #include #include #include -#include #include -#include -#include "inspircd_config.h" +#else + +#include "inspircd_win32wrapper.h" + +#endif + +#include +/* 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); } + }; - /* macros to the relevant system address description structs */ -#ifdef IPV6 + 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]; - typedef struct sockaddr_in6 insp_sockaddr; - typedef struct in6_addr insp_inaddr; -#define AF_FAMILY AF_INET6 -#define PF_PROTOCOL PF_INET6 + 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; + }; -#else + /** 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 + * @return True if the mask matches the address + */ + CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username); - typedef struct sockaddr_in insp_sockaddr; - typedef struct in_addr insp_inaddr; -#define AF_FAMILY AF_INET -#define PF_PROTOCOL PF_INET + /** Return the size of the structure for syscall passing */ + inline int sa_size(const irc::sockets::sockaddrs& sa) { return sa.sa_size(); } -#endif + /** 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); - bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits); - bool MatchCIDR(const char* address, const char* cidr_mask); - bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username); + /** 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); - const char* insp_ntoa(insp_inaddr n); - int insp_aton(const char* a, insp_inaddr* n); + /** 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; "" if not a valid address + */ + inline std::string satouser(const irc::sockets::sockaddrs& sa) { return sa.str(); } + } +} - void Blocking(int s); - void NonBlocking(int s); +#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: + const reference 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(); - int OpenTCPSocket(); - }; + /** Handles sockets internals crap of a connection, convenience wrapper really + */ + void AcceptInternal(); }; #endif +