X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=96f07b6e40f8502f4da364ddff7a2b0c21de29c7;hb=bb35a0fa9cbebe51fa636f707c12ca4a7033dd9a;hp=c2b80a225d7d2d73dd6726bc7e867330417ad573;hpb=a53da00bce41c9fb50ed4c9d33507f27803c1eb7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index c2b80a225..96f07b6e4 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -149,8 +149,8 @@ void InspSocket::SetQueues(int nfd)
 	// attempt to increase socket sendq and recvq as high as its possible
 	int sendbuf = 32768;
 	int recvbuf = 32768;
-	setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf));
-	setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf));
+	if(setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)))
+		this->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
 }
 
 /* Most irc servers require you to specify the ip you want to bind to.
@@ -320,6 +320,11 @@ bool InspSocket::DoConnect()
 		this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time());
 		this->Instance->Timers->AddTimer(this->Timeout);
 	}
+#ifdef WIN32
+	/* Set nonblocking mode after the connect() call */
+	flags = 0;
+	ioctlsocket(this->fd, FIONBIO, &flags);
+#endif
 	this->state = I_CONNECTING;
 	if (this->fd > -1)
 	{
@@ -356,9 +361,12 @@ void InspSocket::Close()
 				Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 			}
 		}
-		this->OnClose();
 		shutdown(this->fd,2);
-		close(this->fd);
+		if (close(this->fd) != -1)
+			this->OnClose();
+
+		if (Instance->SocketCull.find(this) == Instance->SocketCull.end())
+			Instance->SocketCull[this] = this;
 	}
 	errno = save;
 }
@@ -370,11 +378,7 @@ std::string InspSocket::GetIP()
 
 char* InspSocket::Read()
 {
-#ifdef WINDOWS
-	if ((fd < 0) || (m_internalFd > MAX_DESCRIPTORS))
-#else
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-#endif
+	if (!Instance->SE->BoundsCheckFd(this))
 		return NULL;
 
 	int n = 0;
@@ -548,19 +552,16 @@ void SocketTimeout::Tick(time_t now)
 
 bool InspSocket::Poll()
 {
-#ifdef WINDOWS
-	if(Instance->SE->GetRef(this->fd) != this)
-		return false;
-	int incoming = -1;
-#else
-	if (this->Instance->SE->GetRef(this->fd) != this)
-		return false;
-
 	int incoming = -1;
 
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+#ifndef WINDOWS
+	if (!Instance->SE->BoundsCheckFd(this))
 		return false;
 #endif
+
+	if (Instance->SE->GetRef(this->fd) != this)
+		return false;
+
 	switch (this->state)
 	{
 		case I_CONNECTING:
@@ -571,14 +572,12 @@ bool InspSocket::Poll()
 			if (this->fd > -1)
 			{
 				this->Instance->SE->DelFd(this);
-				this->SetState(I_CONNECTED);
 				if (!this->Instance->SE->AddFd(this))
 					return false;
 			}
-#else
-			this->SetState(I_CONNECTED);
 #endif
-			Instance->Log(DEBUG,"Inspsocket I_CONNECTING state");
+			this->SetState(I_CONNECTED);
+
 			if (Instance->Config->GetIOHook(this))
 			{
 				Instance->Log(DEBUG,"Hook for raw connect");
@@ -602,6 +601,8 @@ bool InspSocket::Poll()
 			if ((!*this->host) || strchr(this->host, ':'))
 				length = sizeof(sockaddr_in6);
 #endif
+			void* m_acceptEvent = NULL;
+			GetExt("windows_acceptevent", m_acceptEvent);
 			incoming = _accept (this->fd, client, &length);
 #ifdef IPV6
 			if ((!*this->host) || strchr(this->host, ':'))