Experimental WSAPoll (thanks for not just using poll(), guys) support for Windows...

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

diff --git a/include/inspsocket.h b/include/inspsocket.h
index c3b24ad8f3b6c6aa152675d55e5a827f546d7e45..13dacc90bb229b3714d79ff73c06fef75c38287e 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -116,10 +116,6 @@ class CoreExport BufferedSocket : public EventHandler
         */
        SocketTimeout* Timeout;
 
-       /** Timeout length
-        */
-       unsigned long timeout_val;
-
        /** Socket output buffer (binary safe)
         */
        std::deque<std::string> outbuffer;
@@ -139,12 +135,6 @@ class CoreExport BufferedSocket : public EventHandler
         */
        BufferedSocketState state;
 
-       /**
-        * This value is true if the
-        * socket has timed out.
-        */
-       bool timeout;
-
        /**
         * The IP address being connected
         * to stored in string form for
@@ -357,8 +347,9 @@ class CoreExport BufferedSocket : public EventHandler
        /**
         * This method attempts to connect to a hostname.
         * This method is asyncronous.
+        * @param maxtime Number of seconds to wait, if connecting, before the connection times out and an OnTimeout() event is generated
         */
-       virtual bool DoConnect();
+       virtual bool DoConnect(unsigned long maxtime);
 
        /** Handle event from EventHandler parent class
         */