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.");
- InspIRCd::Exit(EXIT_STATUS_SOCKETENGINE);
+ ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
}
/* Null variables out. */
if (!eh)
return false;
- int fake_fd = GenerateFd(eh->GetFd());
+ int* fake_fd = new int(GenerateFd(eh->GetFd()));
int is_accept = 0;
int opt_len = sizeof(int);
/* In range? */
- if ((fake_fd < 0) || (fake_fd > MAX_DESCRIPTORS))
+ if ((*fake_fd < 0) || (*fake_fd > MAX_DESCRIPTORS))
return false;
/* Already an entry here */
- if (ref[fake_fd])
+ 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)eh->m_internalFd;
+ unsigned long completion_key = (ULONG_PTR)*fake_fd;
/* assign the socket to the completion port */
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 */
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())
if (!eh)
return false;
- int fake_fd = eh->m_internalFd;
+ int* fake_fd = NULL;
+
+ if (!eh->GetExt("internal_fd", fake_fd))
+ return false;
+
int fd = eh->GetFd();
- if (!ref[fake_fd])
+ 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)
+ if (eh->GetExt("windows_readevent", m_readEvent))
{
- if(((Overlapped*)eh->m_readEvent)->m_params != 0)
- delete ((udp_overlap*)((Overlapped*)eh->m_readEvent)->m_params);
+ if(((Overlapped*)m_readEvent)->m_params != 0)
+ delete ((udp_overlap*)((Overlapped*)m_readEvent)->m_params);
- delete ((Overlapped*)eh->m_readEvent);
+ 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;
{
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)eh->m_internalFd;
+ ULONG_PTR completion_key = (ULONG_PTR)*fake_fd;
Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_WRITE_READY, 0);
- eh->m_writeEvent = (void*)ov;
+ eh->Shrink("windows_writeevent");
+ eh->Extend("windows_writeevent",ov);
PostQueuedCompletionStatus(m_completionPort, 0, completion_key, &ov->m_overlap);
}
}
if (!eh)
return false;
+ int* fake_fd = NULL;
+ if (!eh->GetExt("internal_fd", fake_fd))
+ return false;
+
Overlapped * ov = new Overlapped(type, param);
- ULONG_PTR completion_key = (ULONG_PTR)eh->m_internalFd;
+ ULONG_PTR completion_key = (ULONG_PTR)*fake_fd;
return PostQueuedCompletionStatus(m_completionPort, 0, completion_key, &ov->m_overlap);
}
}
break;
}
- eh->m_readEvent = (void*)ov;
+ eh->Extend("windows_readevent", ov);
}
int IOCPEngine::DispatchEvents()
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;
+ 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;
udp_overlap * uv = (udp_overlap*)ov->m_params;
uv->udp_len = len;
this->udp_ov = uv;
- eh->m_readEvent = 0;
+ eh->Shrink("windows_readevent");
eh->HandleEvent(EVENT_READ, 0);
this->udp_ov = 0;
delete uv;
else
{
ret = ioctlsocket(eh->GetFd(), FIONREAD, &bytes_recv);
- eh->m_readEvent = 0;
+ eh->Shrink("windows_readevent");
if(ret != 0 || bytes_recv == 0)
{
/* end of file */
/* 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;
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;
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)
{
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)
projects / user / henk / code / inspircd.git / blobdiff