X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_kqueue.cpp;h=5dd653363947151c313068efdaec6da39dbc688c;hb=ebdaf368e137fc933e648ee88a08a4f83e796f87;hp=92dae312d6d72d013b89196c28cf9711914f05c1;hpb=a018f26eddbc72fdbf87fe5ee89112a53311fff1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 92dae312d..5dd653363 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -1,22 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "exitcodes.h"
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include "socketengine.h"
+#include <iostream>
 
 /** A specialisation of the SocketEngine class, designed to use FreeBSD kqueue().
  */
@@ -39,7 +48,7 @@ public:
 	virtual ~KQueueEngine();
 	bool AddFd(EventHandler* eh, int event_mask);
 	void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
-	virtual bool DelFd(EventHandler* eh);
+	virtual void DelFd(EventHandler* eh);
 	virtual int DispatchEvents();
 	virtual std::string GetName();
 	virtual void RecoverFromFork();
@@ -54,13 +63,13 @@ KQueueEngine::KQueueEngine()
 	size_t len;
 
 	mib[0] = CTL_KERN;
-	mib[1] = KERN_MAXFILES;
+	mib[1] = KERN_MAXFILESPERPROC;
 	len = sizeof(MAX_DESCRIPTORS);
 	sysctl(mib, 2, &MAX_DESCRIPTORS, &len, NULL, 0);
 	if (MAX_DESCRIPTORS <= 0)
 	{
 		ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
-		printf("ERROR: Can't determine maximum number of open sockets!\n");
+		std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
 		ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
 	}
 
@@ -82,8 +91,8 @@ void KQueueEngine::RecoverFromFork()
 	{
 		ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
 		ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: this is a fatal error, exiting now.");
-		printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.\n");
-		printf("ERROR: this is a fatal error, exiting now.\n");
+		std::cout << "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features." << std::endl;
+		std::cout << "ERROR: this is a fatal error, exiting now." << std::endl;
 		ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
 	}
 	CurrentSetSize = 0;
@@ -229,7 +238,7 @@ int KQueueEngine::DispatchEvents()
 			SetEventMask(eh, eh->GetEventMask() & ~bits_to_clr);
 			eh->HandleEvent(EVENT_WRITE);
 
-			if (eh != ref[ke_list[j].ident];
+			if (eh != ref[ke_list[j].ident])
 				// whoops, deleted out from under us
 				continue;
 		}