X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=d3a45475d8c442f8e04496ad6454d6aa073d91ce;hb=ca749a589afc4f12de4bfb0f63591a49e3703372;hp=b8f6387d329c6f691ce7d35f4de32d49e193f93b;hpb=529c6acc0177651e0b01cc6d7dcb7509fce17d14;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index b8f6387d3..d3a45475d 100644 --- a/include/socket.h +++ b/include/socket.h @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. @@ -14,6 +14,8 @@ #ifndef INSPIRCD_SOCKET_H #define INSPIRCD_SOCKET_H +#ifndef WIN32 + #include #include #include @@ -24,10 +26,17 @@ #include #include #include -#include -#include "inspircd_config.h" + +#else + +#include "inspircd_win32wrapper.h" + +#endif + +#include #include "socketengine.h" +/* Contains irc-specific definitions */ namespace irc { /** This namespace contains various protocol-independent helper classes. @@ -37,30 +46,14 @@ namespace irc namespace sockets { - /* macros to the relevant system address description structs */ -#ifdef IPV6 - /** insp_sockaddr for ipv6 - */ - typedef struct sockaddr_in6 insp_sockaddr; - /** insp_inaddr for ipv6 - */ - typedef struct in6_addr insp_inaddr; -#define AF_FAMILY AF_INET6 -#define PF_PROTOCOL PF_INET6 - -#else - /** insp_sockaddr for ipv4 - */ - typedef struct sockaddr_in insp_sockaddr; - /** insp_inaddr for ipv4 - */ - typedef struct in_addr insp_inaddr; -#define AF_FAMILY AF_INET -#define PF_PROTOCOL PF_INET + typedef union { + struct sockaddr sa; + struct sockaddr_in in4; + struct sockaddr_in6 in6; + } sockaddrs; -#endif /** Match raw binary data using CIDR rules. - * + * * This function will use binary comparison to compare the * two bit sequences, address and mask, up to mask_bits * bits in size. If they match, it will return true. @@ -72,7 +65,7 @@ namespace irc * @returns True if the first mask_bits of address matches the first * mask_bits of mask. */ - bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits); + CoreExport bool MatchCIDRBits(const unsigned char* address, const unsigned char* mask, unsigned int mask_bits); /** Match CIDR, without matching username/nickname parts. * @@ -83,7 +76,7 @@ namespace irc * @param cidr_mask The human readable mask, e.g. 1.2.0.0/16 * @return True if the mask matches the address */ - bool MatchCIDR(const char* address, const char* cidr_mask); + CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask); /** Match CIDR, including an optional username/nickname part. * @@ -96,65 +89,118 @@ namespace irc * @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16 * @return True if the mask matches the address */ - bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username); - - /** Convert an insp_inaddr into human readable form. - * - * @param n An insp_inaddr (IP address) structure - * @return A human-readable address. IPV6 addresses - * will be shortened to remove fields which are 0. - */ - const char* insp_ntoa(insp_inaddr n); - - /** Convert a human-readable address into an insp_inaddr. - * - * @param a A human-readable address - * @param n An insp_inaddr struct which the result - * will be copied into on success. - * @return This function will return 0 upon success, - * or any other number upon failure. - */ - int insp_aton(const char* a, insp_inaddr* n); - - /** Make a socket file descriptor a blocking socket - * @param s A valid file descriptor - */ - void Blocking(int s); - - /** Make a socket file descriptor into a nonblocking socket - * @param s A valid file descriptor - */ - void NonBlocking(int s); + CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username); /** Create a new valid file descriptor using socket() * @return On return this function will return a value >= 0 for success, * or a negative value upon failure (negative values are invalid file * descriptors) */ - int OpenTCPSocket(); - }; -}; + CoreExport int OpenTCPSocket(const char* addr, int socktype = SOCK_STREAM); + + /** Return the size of the structure for syscall passing */ + CoreExport int sa_size(irc::sockets::sockaddrs& sa); + + /** 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 char* 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; "" if not a valid address + */ + CoreExport std::string satouser(const irc::sockets::sockaddrs* sa); + } +} + + /** This class handles incoming connections on client ports. - * It will create a new userrec for every valid connection + * It will create a new User for every valid connection * and assign it a file descriptor. */ -class ListenSocket : public EventHandler +class CoreExport ListenSocketBase : public EventHandler { protected: /** The creator/owner of this object */ InspIRCd* ServerInstance; + /** Socket description (shown in stats p) */ + std::string desc; + + /** Address socket is bound to */ + std::string bind_addr; + /** Port socket is bound to */ + int bind_port; + + /** The client address if the most recently connected client. + * Should only be used when accepting a new client. + */ + static irc::sockets::sockaddrs client; + /** The server address used by the most recently connected client. + * This may differ from the bind address by having a nonzero address, + * if the port is wildcard bound, or being IPv4 on a 6to4 IPv6 port. + * The address family will always match that of "client" + */ + static irc::sockets::sockaddrs server; + public: /** Create a new listening socket */ - ListenSocket(InspIRCd* Instance, int sockfd, irc::sockets::insp_sockaddr client, irc::sockets::insp_sockaddr server, int port, char* addr); + ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr); /** Handle an I/O event */ void HandleEvent(EventType et, int errornum = 0); /** Close the socket */ - ~ListenSocket(); + ~ListenSocketBase(); + /** Set descriptive text + */ + void SetDescription(const std::string &description) + { + desc = description; + } + /** Get description for socket + */ + const std::string& GetDescription() + { + return desc; + } + /** Get port number for socket + */ + int GetPort() { return bind_port; } + + /** Get IP address socket is bound to + */ + const std::string &GetIP() { return bind_addr; } + + /** Handles sockets internals crap of a connection, convenience wrapper really + */ + void AcceptInternal(); + + /** Called when a new connection has successfully been accepted on this listener. + * @param fd The file descriptor of the new connection + */ + virtual void OnAcceptReady(int fd) = 0; +}; + +class CoreExport ClientListenSocket : public ListenSocketBase +{ + virtual void OnAcceptReady(int fd); + public: + ClientListenSocket(InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { } }; #endif +