X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=556ee1a9045a4495b868b88d22ac9426dd44cdcd;hb=77b7c4300472ff1ba5c643b75ead4be75625f96f;hp=89b5ca1a40399e6f6fd5fbd2abe4d3ffc94b4fc4;hpb=09dd16b981c38cbde7573398cb50ae1cf0531ade;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index 89b5ca1a4..556ee1a90 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-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * @@ -17,8 +14,6 @@ #ifndef INSPIRCD_SOCKET_H #define INSPIRCD_SOCKET_H -/* This is where we'll define wrappers for socket IO stuff, for neat winsock compatability */ - #ifndef WIN32 #include @@ -30,35 +25,199 @@ #include #include #include -#include #include -#include #else -#include -#include -typedef int socklen_t; +#include "inspircd_win32wrapper.h" #endif -#include "inspircd_config.h" +#include +#include "socketengine.h" -/* macros to the relevant system address description structs */ -#ifdef IPV6 +/* 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 + { -typedef struct sockaddr_in6 insp_sockaddr; -typedef struct in6_addr insp_inaddr; + /* 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 - -typedef struct sockaddr_in insp_sockaddr; -typedef struct in_addr insp_inaddr; + /** 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 #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. + * @param address The whole address, of 4 or 16 bytes in length + * @param mask The mask, from 1 to 16 bytes in length, anything + * from 1 to 128 bits of which is significant + * @param mask_Bits How many bits of the mask parameter are significant + * for this comparison. + * @returns True if the first mask_bits of address matches the first + * mask_bits of mask. + */ + CoreExport bool MatchCIDRBits(const unsigned char* address, const unsigned char* mask, unsigned int mask_bits); + + /** Match CIDR, without matching username/nickname parts. + * + * This function will compare a human-readable address against a human- + * readable CIDR mask, for example 1.2.3.4 against 1.2.0.0/16. This + * method supports both IPV4 and IPV6 addresses. + * @param address The human readable address, e.g. 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); + + /** 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); + + /** 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. + */ + CoreExport 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 method will return a negative value if address + * does not contain a valid address family. 0 if the address is + * does not contain a valid string representing a valid network + * address. A positive value is returned if the network address + * was successfully converted. + + * or any other number upon failure. + */ + CoreExport int insp_aton(const char* a, insp_inaddr* n); + + /** 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) + */ + CoreExport int OpenTCPSocket(char* addr, int socktype = SOCK_STREAM); + } +} + -int OpenTCPSocket(); -bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr); -int BindPorts(bool bail); + +/** 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 +{ + protected: + /** The creator/owner of this object + */ + InspIRCd* ServerInstance; + /** Socket description (shown in stats p) */ + std::string desc; + /** Socket address family */ + int family; + /** Address socket is bound to */ + std::string bind_addr; + /** Port socket is bound to */ + int bind_port; + + static sockaddr *sock_us; + + static sockaddr *client; + + static sockaddr *raddr; + + static unsigned int socketcount; + + public: + /** Create a new listening socket + */ + ListenSocket(InspIRCd* Instance, int port, char* addr); + /** Handle an I/O event + */ + void HandleEvent(EventType et, int errornum = 0); + /** Close the socket + */ + ~ListenSocket(); + /** 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 + */ + 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 ipconnectedto The IP address the connection arrived on + * @param fd The file descriptor of the new connection + */ + virtual void OnAcceptReady(const std::string &ipconnectedto, int fd); +}; + +//class CoreExport ListenSocketClient : public ListenSocket +//{ +// +//} #endif +