Fix for listening sockets not clearing their timeout on connected. Reported by Sazpaimon.

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

diff --git a/include/inspsocket.h b/include/inspsocket.h
index a82f8bb82b13b45ed05eb9c0201d4dc06a7532db..67b2c02405c5a3897888800a97063714f08f45cd 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -56,11 +56,6 @@ enum BufferedSocketError
 class BufferedSocket;
 class InspIRCd;
 
-using irc::sockets::insp_sockaddr;
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_ntoa;
-using irc::sockets::insp_aton;
-
 /** Used to time out socket connections
  */
 class CoreExport SocketTimeout : public Timer
@@ -69,12 +64,15 @@ class CoreExport SocketTimeout : public Timer
        /** BufferedSocket the class is attached to
         */
        BufferedSocket* sock;
+
        /** Server instance creating the timeout class
         */
        InspIRCd* ServerInstance;
+
        /** File descriptor of class this is attached to
         */
        int sfd;
+
  public:
        /** Create a socket timeout class
         * @param fd File descriptor of BufferedSocket
@@ -84,6 +82,7 @@ class CoreExport SocketTimeout : public Timer
         * @param now The current time
         */
        SocketTimeout(int fd, InspIRCd* Instance, BufferedSocket* thesock, long secs_from_now, time_t now) : Timer(secs_from_now, now), sock(thesock), ServerInstance(Instance), sfd(fd) { };
+
        /** Handle tick event
         */
        virtual void Tick(time_t now);
@@ -108,7 +107,7 @@ class CoreExport BufferedSocket : public EventHandler
 
        /** Instance we were created by
         */
-       InspIRCd* Instance;
+       InspIRCd* ServerInstance;
 
        /** Timeout class or NULL
         */
@@ -246,7 +245,7 @@ class CoreExport BufferedSocket : public EventHandler
         * other end of the socket.
         *
         * Further write events will not be triggered
-        * unless you call WantWrite().
+        * unless you call SocketEngine::WantWrite().
         *
         * The default behaviour of this method is to
         * flush the write buffer, respecting the IO
@@ -306,27 +305,14 @@ class CoreExport BufferedSocket : public EventHandler
         */
        void SetState(BufferedSocketState s);
 
-       /**
-        * Call this to receive the next write event
-        * that comes along for this fd to the OnWriteReady
-        * method.
-        */
-       void WantWrite();
-
        /**
         * Returns the current socket state.
         */
        BufferedSocketState GetState();
 
-       /**
-        * Only the core should call this function.
-        * When called, it is assumed the socket is ready
-        * to read data, and the method call routes the
-        * event to the various methods of BufferedSocket
-        * for you to handle. This can also cause the
-        * socket's state to change.
-        */
-       bool Poll();
+       /** Mark a socket as being connected and call appropriate events.
+        */
+       bool InternalMarkConnected();
 
        /**
         * This method causes the socket to close, and may