X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=53bad88f045f3d5dea3eed6a2d5db035f509d02d;hb=c84ad4cc16452b86bb444a22a55203afa4fa5454;hp=db0aa7f9258d16c45fe8915470d5c61024659515;hpb=7d4edd5ac3987ff1161a5152e3aa19c8a0a8260a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index db0aa7f92..53bad88f0 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 @@ -34,20 +34,9 @@ #endif #include -#include "inspircd_config.h" #include "socketengine.h" -/* Accept Define */ -#ifdef CONFIG_USE_IOCP -#define _accept(s, addr, addrlen) __accept_socket(s, addr, addrlen, m_acceptEvent) -#define _getsockname(fd, sockptr, socklen) __getsockname(fd, sockptr, socklen, m_acceptEvent) -#define _recvfrom(s, buf, len, flags, from, fromlen) __recvfrom(s, buf, len, flags, from, fromlen, ((IOCPEngine*)ServerInstance->SE)->udp_ov) -#else -#define _recvfrom recvfrom -#define _accept accept -#define _getsockname getsockname -#endif - +/* Contains irc-specific definitions */ namespace irc { /** This namespace contains various protocol-independent helper classes. @@ -141,16 +130,6 @@ 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 @@ -161,7 +140,7 @@ namespace irc } /** 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 @@ -170,9 +149,13 @@ class CoreExport ListenSocket : public EventHandler /** 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; public: /** Create a new listening socket @@ -190,17 +173,20 @@ class CoreExport ListenSocket : public EventHandler { 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; @@ -208,3 +194,4 @@ class CoreExport ListenSocket : public EventHandler }; #endif +