We were lucky this one didnt bring down the whole devnet (see cmd_part.cpp diff)

[user/henk/code/inspircd.git] / include / socket.h

diff --git a/include/socket.h b/include/socket.h
index de0b0510bf67d8998f715c3e41de92b230b691b7..7ff40794c7928574f6e15af9555164466d461297 100644 (file)
--- 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,18 +34,9 @@
 #endif
 
 #include <errno.h>
-#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)
-#else
-#define _accept accept
-#define _getsockname getsockname
-#endif
-
+/* Contains irc-specific definitions */
 namespace irc
 {
        /** This namespace contains various protocol-independent helper classes.
@@ -139,27 +130,17 @@ 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);
-       };
-};
+       }
+}
 
 /** 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
@@ -168,10 +149,23 @@ 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;
+
+       static sockaddr *sock_us;
+
+       static sockaddr *client;
+
+       static sockaddr *raddr;
+
+       static unsigned int socketcount;
+
  public:
        /** Create a new listening socket
         */
@@ -188,17 +182,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;
@@ -206,3 +203,4 @@ class CoreExport ListenSocket : public EventHandler
 };
 
 #endif
+