Reduce size of max number of bytes in a bitfield from a 4 or 8 byte field to a 1...

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

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 3791aa3e02cfb6ea05d0a5db3d26cb0ee15f18b0..71f16951ec4ed02a59ded8c79f530dcc14977250 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -24,6 +24,7 @@
 #include "inspircd_config.h"
 #include "socket.h"
 #include "inspsocket.h"
+#include "timer.h"
 
 /**
  * States which a socket may be in
@@ -43,6 +44,19 @@ using irc::sockets::insp_inaddr;
 using irc::sockets::insp_ntoa;
 using irc::sockets::insp_aton;
 
+/** Used to time out socket connections
+ */
+class SocketTimeout : public InspTimer
+{
+ private:
+       InspSocket* sock;
+       InspIRCd* ServerInstance;
+       int sfd;
+ public:
+       SocketTimeout(int fd, InspIRCd* Instance, InspSocket* thesock, long secs_from_now, time_t now) : InspTimer(secs_from_now, now), sock(thesock), ServerInstance(Instance), sfd(fd) { };
+       virtual void Tick(time_t now);
+};
+
 /**
  * InspSocket is an extendable socket class which modules
  * can use for TCP socket support. It is fully integrated
@@ -59,6 +73,10 @@ class InspSocket : public EventHandler
  public:
        InspIRCd* Instance;
 
+       SocketTimeout* Timeout;
+
+       unsigned long timeout_val;
+
        std::deque<std::string> outbuffer;
 
        /**
@@ -91,13 +109,6 @@ class InspSocket : public EventHandler
         */
         insp_inaddr addy;
 
-       /**
-        * When this time is reached,
-        * the socket times out if it is
-        * in the CONNECTING state
-        */
-        time_t timeout_end;
-
        /**
         * This value is true if the
         * socket has timed out.
@@ -267,14 +278,6 @@ class InspSocket : public EventHandler
         */
        std::string GetIP();
 
-       /**
-        * This function checks if the socket has
-        * timed out yet, given the current time
-        * in the parameter.
-        * @return true if timed out, false if not timed out
-        */
-       bool Timeout(time_t current);
-
        /**
         * Writes a std::string to the socket. No carriage
         * returns or linefeeds are appended to the string.
@@ -362,7 +365,7 @@ class InspSocket : public EventHandler
         */
        void MarkAsClosed();
 
-       void HandleEvent(EventType et);
+       void HandleEvent(EventType et, int errornum = 0);
 
        bool Readable();
 };