X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=e1050201ae20b13b4b36d48f4ee17c00fa317d53;hb=ffc039651676e0f679726b15fac4bf133e7e5bc2;hp=c00c7f1318744fdf8b2ccc8081e6b6ca20ac5a3b;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index c00c7f131..e1050201a 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,6 +14,8 @@ #ifndef INSPIRCD_SOCKET_H #define INSPIRCD_SOCKET_H +#ifndef WIN32 + #include #include #include @@ -27,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. @@ -63,7 +69,7 @@ namespace irc #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. @@ -75,7 +81,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. * @@ -86,7 +92,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. * @@ -99,52 +105,122 @@ 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); + 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. */ - const char* insp_ntoa(insp_inaddr n); + 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 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); + * @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. - /** Make a socket file descriptor into a nonblocking socket - * @param s A valid file descriptor + * or any other number upon failure. */ - void NonBlocking(int s); + 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) */ - int OpenTCPSocket(); - }; -}; + CoreExport int OpenTCPSocket(const char* addr, int socktype = SOCK_STREAM); + } +} + -class ListenSocket : public EventHandler + +/** 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 ListenSocketBase : 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: - ListenSocket(InspIRCd* Instance, int sockfd, irc::sockets::insp_sockaddr client, irc::sockets::insp_sockaddr server, int port, char* addr); - void HandleEvent(EventType et); + /** Create a new listening socket + */ + ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr); + /** Handle an I/O event + */ + void HandleEvent(EventType et, int errornum = 0); + /** Close the socket + */ + ~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 + */ + 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 + * @param incomingip The IP from which the connection was made + */ + virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip) = 0; +}; + +class CoreExport ClientListenSocket : public ListenSocketBase +{ + virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip); + public: + ClientListenSocket(InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { } }; #endif +