This was never supposed to be invoked on /rehash, only startup.. so move it to startu...

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

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 9ce7315c69848e587ab7a03a4416f0441ed73183..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
         */