X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=494422075b2b8736e4edc4a1d1c7a3025cbccd73;hb=d618b3c186e58a55ab5103da2790459daed6c45e;hp=3610addba9d4ac0c7fc2cb1c094f0f997b4f66fa;hpb=efe77ba63b1e519fc4d563bd9b599277c4bd96e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 3610addba..494422075 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -23,9 +23,6 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "inspstring.h"
-#include "socketengine.h"
 #include "iohook.h"
 
 #ifndef DISABLE_WRITEV
@@ -110,8 +107,8 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 	if (!SocketEngine::AddFd(this, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE | FD_WRITE_WILL_BLOCK))
 		return I_ERR_NOMOREFDS;
 
-	this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
-	ServerInstance->Timers->AddTimer(this->Timeout);
+	this->Timeout = new SocketTimeout(this->GetFd(), this, timeout);
+	ServerInstance->Timers.AddTimer(this->Timeout);
 
 	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BufferedSocket::DoConnect success");
 	return I_ERR_NONE;
@@ -138,9 +135,7 @@ void StreamSocket::Close()
 			DelIOHook();
 		}
 		SocketEngine::Shutdown(this, 2);
-		SocketEngine::DelFd(this);
 		SocketEngine::Close(this);
-		fd = -1;
 	}
 }