X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_iocp.cpp;h=f7448f85ff80af5924cb1f0a2688ea1ee8eb5ccc;hb=2e28b264afa667923b6c17d88ffcb12315309936;hp=1ec70d2893a4afd3ce36819b8a533a86b1266681;hpb=c3f992455f96c66ee5003476831d192f6665a8aa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine_iocp.cpp b/src/socketengine_iocp.cpp
index 1ec70d289..f7448f85f 100644
--- a/src/socketengine_iocp.cpp
+++ b/src/socketengine_iocp.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "socketengine_iocp.h"
+#include "exitcodes.h"
 #include <mswsock.h>
 
 IOCPEngine::IOCPEngine(InspIRCd * Instance) : SocketEngine(Instance)
@@ -19,6 +20,15 @@ IOCPEngine::IOCPEngine(InspIRCd * Instance) : SocketEngine(Instance)
 	/* Create completion port */
 	m_completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)0, 0);
 
+        if (!m_completionPort)
+	{
+		ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
+		ServerInstance->Log(SPARSE,"ERROR: this is a fatal error, exiting now.");
+		printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
+		printf("ERROR: this is a fatal error, exiting now.");
+		ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+	}
+
 	/* Null variables out. */
 	CurrentSetSize = 0;
 	EngineHandle = 0;
@@ -27,31 +37,45 @@ IOCPEngine::IOCPEngine(InspIRCd * Instance) : SocketEngine(Instance)
 
 IOCPEngine::~IOCPEngine()
 {
+	/* Clean up winsock and close completion port */
 	CloseHandle(m_completionPort);
+	WSACleanup();
 }
 
 bool IOCPEngine::AddFd(EventHandler* eh)
 {
-	int fake_fd = GenerateFd();
+	/* Does it at least look valid? */
+	if (!eh)
+		return false;
+
+	int* fake_fd = new int(GenerateFd(eh->GetFd()));
 	int is_accept = 0;
 	int opt_len = sizeof(int);
-	if(fake_fd < 0)
+
+	/* In range? */
+	if ((*fake_fd < 0) || (*fake_fd > MAX_DESCRIPTORS))
 		return false;
 
+	/* Already an entry here */
+	if (ref[*fake_fd])
+	{
+		delete fake_fd;
+		return false;
+	}
+
 	/* are we a listen socket? */
 	getsockopt(eh->GetFd(), SOL_SOCKET, SO_ACCEPTCONN, (char*)&is_accept, &opt_len);
 
 	/* set up the read event so the socket can actually receive data :P */
-	eh->m_internalFd = fake_fd;
-	eh->m_writeEvent = 0;
-	eh->m_acceptEvent = 0;
+	eh->Extend("internal_fd", fake_fd);
 
+	unsigned long completion_key = (ULONG_PTR)*fake_fd;
 	/* assign the socket to the completion port */
-	if(!CreateIoCompletionPort((HANDLE)eh->GetFd(), m_completionPort, (ULONG_PTR)eh->m_internalFd, 0))
+	if (!CreateIoCompletionPort((HANDLE)eh->GetFd(), m_completionPort, completion_key, 0))
 		return false;
 
 	/* set up binding, increase set size */
-	ref[fake_fd] = eh;
+	ref[*fake_fd] = eh;
 	++CurrentSetSize;
 
 	/* setup initial events */
@@ -61,7 +85,7 @@ bool IOCPEngine::AddFd(EventHandler* eh)
 		PostReadEvent(eh);
 
 	/* log message */
-	ServerInstance->Log(DEBUG, "New fake fd: %u, real fd: %u, address 0x%p", fake_fd, eh->GetFd(), eh);
+	ServerInstance->Log(DEBUG, "New fake fd: %u, real fd: %u, address 0x%p", *fake_fd, eh->GetFd(), eh);
 
 	/* post a write event if there is data to be written */
 	if(eh->Writeable())
@@ -83,35 +107,59 @@ bool IOCPEngine::AddFd(EventHandler* eh)
 
 bool IOCPEngine::DelFd(EventHandler* eh, bool force /* = false */)
 {
-	int fake_fd = eh->m_internalFd;
+	if (!eh)
+		return false;
+
+	int* fake_fd = NULL;
+
+	if (!eh->GetExt("internal_fd", fake_fd))
+		return false;
+
 	int fd = eh->GetFd();
 	
-	if(ref[fake_fd] == 0)
+	if (!ref[*fake_fd])
 		return false;
 
-	ServerInstance->Log(DEBUG, "Removing fake fd %u, real fd %u, address 0x%p", fake_fd, eh->GetFd(), eh);
+	void* m_readEvent = NULL;
+	void* m_writeEvent = NULL;
+	void* m_acceptEvent = NULL;
+
+	ServerInstance->Log(DEBUG, "Removing fake fd %u, real fd %u, address 0x%p", *fake_fd, eh->GetFd(), eh);
 
 	/* Cancel pending i/o operations. */
 	if (CancelIo((HANDLE)fd) == FALSE)
 		return false;
 
 	/* Free the buffer, and delete the event. */
-	if(eh->m_readEvent != 0)
-		delete ((Overlapped*)eh->m_readEvent);
+	if (eh->GetExt("windows_readevent", m_readEvent))
+	{
+		if(((Overlapped*)m_readEvent)->m_params != 0)
+			delete ((udp_overlap*)((Overlapped*)m_readEvent)->m_params);
+
+		delete ((Overlapped*)m_readEvent);
+		eh->Shrink("windows_readevent");
+	}
 
-	if(eh->m_writeEvent != 0)
-		delete ((Overlapped*)eh->m_writeEvent);
+	if(eh->GetExt("windows_writeevent", m_writeEvent))
+	{
+		delete ((Overlapped*)m_writeEvent);
+		eh->Shrink("windows_writeevent");
+	}
 
-	if(eh->m_acceptEvent != 0)
+	if(eh->GetExt("windows_acceptevent", m_acceptEvent))
 	{
-		delete ((accept_overlap*)((Overlapped*)eh->m_acceptEvent)->m_params);
-		delete ((Overlapped*)eh->m_acceptEvent);
+		delete ((accept_overlap*)((Overlapped*)m_acceptEvent)->m_params);
+		delete ((Overlapped*)m_acceptEvent);
+		eh->Shrink("windows_accepevent");
 	}
 
 	/* Clear binding */
-	ref[fake_fd] = 0;
+	ref[*fake_fd] = 0;
 	m_binding.erase(eh->GetFd());
 
+	delete fake_fd;
+	eh->Shrink("internal_fd");
+
 	/* decrement set size */
 	--CurrentSetSize;
 	
@@ -121,23 +169,45 @@ bool IOCPEngine::DelFd(EventHandler* eh, bool force /* = false */)
 
 void IOCPEngine::WantWrite(EventHandler* eh)
 {
+	if (!eh)
+		return;
+	
+	void* m_writeEvent = NULL;
+
+	int* fake_fd = NULL;
+	if (!eh->GetExt("internal_fd", fake_fd))
+		return;
+
 	/* Post event - write begin */
-	if(!eh->m_writeEvent)
+	if(!eh->GetExt("windows_writeevent", m_writeEvent))
 	{
+		ULONG_PTR completion_key = (ULONG_PTR)*fake_fd;
 		Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_WRITE_READY, 0);
-		eh->m_writeEvent = (void*)ov;
-		PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);
+		eh->Shrink("windows_writeevent");
+		eh->Extend("windows_writeevent",ov);
+		PostQueuedCompletionStatus(m_completionPort, 0, completion_key, &ov->m_overlap);
 	}
 }
 
 bool IOCPEngine::PostCompletionEvent(EventHandler * eh, SocketIOEvent type, int param)
 {
+	if (!eh)
+		return false;
+
+	int* fake_fd = NULL;
+	if (!eh->GetExt("internal_fd", fake_fd))
+		return false;
+
 	Overlapped * ov = new Overlapped(type, param);
-	return PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);
+	ULONG_PTR completion_key = (ULONG_PTR)*fake_fd;
+	return PostQueuedCompletionStatus(m_completionPort, 0, completion_key, &ov->m_overlap);
 }
 
 void IOCPEngine::PostReadEvent(EventHandler * eh)
 {
+	if (!eh)
+		return;
+
 	Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_READ_READY, 0);
 	DWORD flags = 0;
 	DWORD r_length = 0;
@@ -163,10 +233,15 @@ void IOCPEngine::PostReadEvent(EventHandler * eh)
 	{
 		case SOCK_DGRAM:			/* UDP Socket */
 		{
-			if(WSARecvFrom(eh->GetFd(), &buf, 1, &r_length, &flags, 0, 0, &ov->m_overlap, 0))
+			udp_overlap * uv = new udp_overlap;
+			uv->udp_sockaddr_len = sizeof(sockaddr);
+			buf.buf = (char*)uv->udp_buffer;
+			buf.len = sizeof(uv->udp_buffer);
+			ov->m_params = (unsigned long)uv;
+			if(WSARecvFrom(eh->GetFd(), &buf, 1, &uv->udp_len, &flags, uv->udp_sockaddr, (LPINT)&uv->udp_sockaddr_len, &ov->m_overlap, 0))
 			{
 				int err = WSAGetLastError();
-				if(WSAGetLastError() != WSA_IO_PENDING)
+				if(err != WSA_IO_PENDING)
 				{
 					delete ov;
 					PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, 0);
@@ -197,7 +272,7 @@ void IOCPEngine::PostReadEvent(EventHandler * eh)
 		}
 		break;
 	}
-	eh->m_readEvent = (void*)ov;
+	eh->Extend("windows_readevent", ov);
 }
 
 int IOCPEngine::DispatchEvents()
@@ -206,38 +281,65 @@ int IOCPEngine::DispatchEvents()
 	LPOVERLAPPED overlap;
 	Overlapped * ov;
 	EventHandler * eh;
-	int intfd;
+	ULONG_PTR intfd;
 	int ret;
 	unsigned long bytes_recv;
 
-	while(GetQueuedCompletionStatus(m_completionPort, &len, (PULONG_PTR)&intfd, &overlap, 100))
+	while (GetQueuedCompletionStatus(m_completionPort, &len, &intfd, &overlap, 1000))
 	{
+		if (intfd < 0 || intfd > MAX_DESCRIPTORS)
+			continue;
+
 		// woot, we got an event on a socket :P
 		eh = ref[intfd];
 		ov = CONTAINING_RECORD(overlap, Overlapped, m_overlap);
-		if(eh == 0) continue;
+
+		if (eh == 0)
+			continue;
+
+		void* m_readEvent = NULL;
+		void* m_writeEvent = NULL;
+
+		eh->GetExt("windows_readevent", m_readEvent);
+		eh->GetExt("windows_writeevent", m_writeEvent);
+
 		switch(ov->m_event)
 		{
 			case SOCKET_IO_EVENT_WRITE_READY:
 			{
-				eh->m_writeEvent = 0;
+				eh->Shrink("windows_writeevent");
 				eh->HandleEvent(EVENT_WRITE, 0);
 			}
 			break;
 
 			case SOCKET_IO_EVENT_READ_READY:
 			{
-				ret = ioctlsocket(eh->GetFd(), FIONREAD, &bytes_recv);
-				eh->m_readEvent = 0;
-				if(ret != 0 || bytes_recv == 0)
+				if(ov->m_params)
 				{
-					/* end of file */
-					PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, EIO); /* Old macdonald had an error, EIEIO. */
+					// if we had params, it means we are a udp socket with a udp_overlap pointer in this long.
+					udp_overlap * uv = (udp_overlap*)ov->m_params;
+					uv->udp_len = len;
+					this->udp_ov = uv;
+					eh->Shrink("windows_readevent");
+					eh->HandleEvent(EVENT_READ, 0);
+					this->udp_ov = 0;
+					delete uv;
+					PostReadEvent(eh);
 				}
 				else
 				{
-					eh->HandleEvent(EVENT_READ, 0);
-					PostReadEvent(eh);
+					ret = ioctlsocket(eh->GetFd(), FIONREAD, &bytes_recv);
+					eh->Shrink("windows_readevent");
+					if(ret != 0 || bytes_recv == 0)
+					{
+						/* end of file */
+						PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, EIO); /* Old macdonald had an error, EIEIO. */
+					}
+					else
+					{
+						eh->HandleEvent(EVENT_READ, 0);
+						PostReadEvent(eh);
+					}
 				}
 			}
 			break;
@@ -247,7 +349,7 @@ int IOCPEngine::DispatchEvents()
 				/* this is kinda messy.. :/ */
 				eh->HandleEvent(EVENT_READ, ov->m_params);
 				delete ((accept_overlap*)ov->m_params);
-				eh->m_acceptEvent = 0;
+				eh->Shrink("windows_acceptevent");
 				PostAcceptEvent(eh);
 			}
 			break;
@@ -267,7 +369,22 @@ int IOCPEngine::DispatchEvents()
 
 void IOCPEngine::PostAcceptEvent(EventHandler * eh)
 {
+	if (!eh)
+		return;
+
+	int on = 1;
+	u_long arg = 1;
+	struct linger linger = { 0 };
+
 	int fd = WSASocket(AF_INET, SOCK_STREAM, 0, 0, 0, WSA_FLAG_OVERLAPPED);
+
+	setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+	/* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
+	linger.l_onoff = 1;
+	linger.l_linger = 1;
+	setsockopt(fd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger));
+	ioctlsocket(fd, FIONBIO, &arg);
+
 	int len = sizeof(sockaddr_in) + 16;
 	DWORD dwBytes;
 	accept_overlap* ao = new accept_overlap;
@@ -275,7 +392,7 @@ void IOCPEngine::PostAcceptEvent(EventHandler * eh)
 	ao->socket = fd;
 
 	Overlapped* ov = new Overlapped(SOCKET_IO_EVENT_ACCEPT, (int)ao);
-	eh->m_acceptEvent = (void*)ov;
+	eh->Extend("windows_acceptevent", ov);
 
 	if(AcceptEx(eh->GetFd(), fd, ao->buf, 0, len, len, &dwBytes, &ov->m_overlap) == FALSE)
 	{
@@ -293,11 +410,51 @@ std::string IOCPEngine::GetName()
 	return "iocp";
 }
 
-int __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent)
+EventHandler * IOCPEngine::GetRef(int fd)
 {
-	Overlapped* ovl = (Overlapped*)acceptevent;
-	accept_overlap* ov = (accept_overlap*)ovl->m_params;
+	map<int, EventHandler*>::iterator itr = m_binding.find(fd);
+	return (itr == m_binding.end()) ? 0 : itr->second;
+}
+
+bool IOCPEngine::HasFd(int fd)
+{
+	return (GetRef(fd) != 0);
+}
+
+bool IOCPEngine::BoundsCheckFd(EventHandler* eh)
+{
+	int * internal_fd;
+	if (!eh || eh->GetFd() < 0)
+		return false;
+
+	if(!eh->GetExt("internal_fd", internal_fd))
+		return false;
+
+	if(*internal_fd > MAX_DESCRIPTORS)
+		return false;
+
+	return true;
+}
+
+EventHandler * IOCPEngine::GetIntRef(int fd)
+{
+	if(fd < 0 || fd > MAX_DESCRIPTORS)
+		return 0;
+	return ref[fd];
+}
+
+int IOCPEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
+{
+	SOCKET s = fd->GetFd();
+
+	Overlapped* acceptevent = NULL;
+	if (!fd->GetExt("windows_acceptevent", acceptevent))
+		/* Shit, no accept event on this socket! :( */
+		return -1;
 
+	Overlapped* ovl = acceptevent;
+	accept_overlap* ov = (accept_overlap*)ovl->m_params;
+	
 	sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
 	sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
 
@@ -307,9 +464,13 @@ int __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent
 	return ov->socket;
 }
 
-int __getsockname(SOCKET s, sockaddr * name, int * namelen, void * acceptevent)
+int IOCPEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* name)
 {
-	Overlapped* ovl = (Overlapped*)acceptevent;
+	Overlapped* ovl = NULL;
+	
+	if (!fd->GetExt("windows_acceptevent", acceptevent))
+		return -1;
+
 	accept_overlap* ov = (accept_overlap*)ovl->m_params;
 
 	sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
@@ -321,21 +482,35 @@ int __getsockname(SOCKET s, sockaddr * name, int * namelen, void * acceptevent)
 	return 0;
 }
 
-EventHandler * IOCPEngine::GetRef(int fd)
+int IOCPEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)
 {
-	map<int, EventHandler*>::iterator itr = m_binding.find(fd);
-	return (itr == m_binding.end()) ? 0 : itr->second;
+	udp_overlap * ov = NULL;
+	if (!fd->GetExt("windows_readevent", ov))
+		return -1;
+        memcpy(buf, ov->udp_buffer, ov->udp_len);
+	memcpy(from, ov->udp_sockaddr, *fromlen);
+	return ov->udp_len;
 }
 
-bool IOCPEngine::HasFd(int fd)
+int IOCPEngine::Blocking(int fd)
 {
-	return (GetRef(fd) != 0);
+	unsigned long opt = 0;
+	ioctlsocket(s, FIONBIO, &opt);
 }
 
-EventHandler * IOCPEngine::GetIntRef(int fd)
+int IOCPEngine::NonBlocking(int fd)
 {
-	if(fd < 0 || fd > MAX_DESCRIPTORS)
-		return 0;
-	return ref[fd];
+	unsigned long opt = 1;
+	ioctlsocket(s, FIONBIO, &opt);
+}
+
+int IOCPEngine::Close(int fd)
+{
+	return closesocket(socket);
+}
+
+int IOCPEngine::Close(EventHandler* fd)
+{
+	return this->Close(fd->GetFd());
 }