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 6d234134e281bf10495179ab56ad77c9c8993e79..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
@@ -112,7 +107,7 @@ class CoreExport BufferedSocket : public EventHandler
 
        /** Instance we were created by
         */
-       InspIRCd* Instance;
+       InspIRCd* ServerInstance;
 
        /** Timeout class or NULL
         */