X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_kqueue.cpp;h=02cef0e44d494f9e04955159d567efcb5b8860bb;hb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;hp=9a63c972fc2fdd67fba91c883d6bee51bd412f80;hpb=f4a1bfe7c060f633de970287ff5e49dcc57f5a9a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp
index 9a63c972f..02cef0e44 100644
--- a/src/socketengine_kqueue.cpp
+++ b/src/socketengine_kqueue.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -49,18 +46,18 @@ bool KQueueEngine::AddFd(EventHandler* eh)
 
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
 	{
-		ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+		ServerInstance->Log(DEBUG,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
 		return false;
 	}
 	if (GetRemainingFds() <= 1)
 	{
-		ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!");
+		ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
 		return false;
 	}
 
 	if (ref[fd])
 	{
-		ServerInstance->Log(DEFAULT,"ERROR: Slot already occupied");
+		ServerInstance->Log(DEBUG,"ERROR: Slot already occupied");
 		return false;
 	}
 
@@ -142,8 +139,23 @@ int KQueueEngine::DispatchEvents()
 	for (int j = 0; j < i; j++)
 	{
 		ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ke_list[j].flags & EVFILT_WRITE ? "write" : "read", ke_list[j].ident);
+		if (ke_list[j].flags & EV_EOF)
+		{
+			ServerInstance->Log(DEBUG,"kqueue: Error on FD %d", ke_list[j].ident);
+			/* We love you kqueue, oh yes we do *sings*!
+			 * kqueue gives us the error number directly in the EOF state!
+			 * Unlike smelly epoll and select, where we have to getsockopt
+			 * to get the error, this saves us time and cpu cycles. Go BSD!
+			 */
+			if (ref[ke_list[j].ident])
+				ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
+			continue;
+		}
 		if (ke_list[j].flags & EVFILT_WRITE)
 		{
+			/* This looks wrong but its right. As above, theres no modify 
+			 * call in kqueue. See the manpage.
+			 */
 			struct kevent ke;
 			EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
 			int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
@@ -151,11 +163,13 @@ int KQueueEngine::DispatchEvents()
 			{
 				ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d back to just wanting to read!", ke_list[j].ident);
 			}
-			ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
+			if (ref[ke_list[j].ident])
+				ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
 		}
 		else
 		{
-			ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
+			if (ref[ke_list[j].ident])
+				ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
 		}
 	}