X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=e1050201ae20b13b4b36d48f4ee17c00fa317d53;hb=ffc039651676e0f679726b15fac4bf133e7e5bc2;hp=57725b95fedc0edcc4168c73c3126e18b05b9c90;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index 57725b95f..e1050201a 100644 --- a/include/socket.h +++ b/include/socket.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -33,27 +33,9 @@ #endif -#include -#include "inspircd_config.h" +#include #include "socketengine.h" -/* Accept Define */ -#ifdef CONFIG_USE_IOCP -/* IOCP wrapper for accept() */ -#define _accept(s, addr, addrlen) __accept_socket(s, addr, addrlen, m_acceptEvent) -/* IOCP wrapper for getsockname() */ -#define _getsockname(fd, sockptr, socklen) __getsockname(fd, sockptr, socklen, m_acceptEvent) -/* IOCP wrapper for recvfrom() */ -#define _recvfrom(s, buf, len, flags, from, fromlen) __recvfrom(s, buf, len, flags, from, fromlen, ((IOCPEngine*)ServerInstance->SE)->udp_ov) -#else -/* No wrapper for recvfrom() */ -#define _recvfrom recvfrom -/* No wrapper for accept() */ -#define _accept accept -/* No wrapper for getsockname() */ -#define _getsockname getsockname -#endif - /* Contains irc-specific definitions */ namespace irc { @@ -87,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. @@ -99,7 +81,7 @@ namespace irc * @returns True if the first mask_bits of address matches the first * mask_bits of mask. */ - CoreExport 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. * @@ -110,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 */ - CoreExport 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. * @@ -123,10 +105,10 @@ namespace irc * @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 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. @@ -134,7 +116,7 @@ namespace irc 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. @@ -148,30 +130,22 @@ namespace irc */ CoreExport int insp_aton(const char* a, insp_inaddr* n); - /** Make a socket file descriptor a blocking socket - * @param s A valid file descriptor - */ - CoreExport void Blocking(int s); - - /** Make a socket file descriptor into a nonblocking socket - * @param s A valid file descriptor - */ - CoreExport void NonBlocking(int s); - /** 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); + CoreExport int OpenTCPSocket(const char* addr, int socktype = SOCK_STREAM); } } + + /** 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 CoreExport ListenSocket : public EventHandler +class CoreExport ListenSocketBase : public EventHandler { protected: /** The creator/owner of this object @@ -185,16 +159,25 @@ class CoreExport ListenSocket : public EventHandler 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); + 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) @@ -219,6 +202,24 @@ class CoreExport ListenSocket : public EventHandler { 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