X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_poll.cpp;h=d25f21d9462d8b40bec004d2ba956c7f25b319bf;hb=092f2b181848d4575f4317267866dade7312c542;hp=59991d80dbf224b8fd6ed24fb08c6f199ca8acf2;hpb=a3e0768758ca68429a29d9c78ce672f2d938c6e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 59991d80d..d25f21d94 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -1,10 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014 Adam <Adam@anope.org>
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
- *   Copyright (C) 2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2014, 2017 Adam <Adam@anope.org>
+ *   Copyright (C) 2013, 2016-2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -21,7 +23,6 @@
  */
 
 
-#include "exitcodes.h"
 #include "inspircd.h"
 
 #include <sys/poll.h>
@@ -36,21 +37,12 @@ namespace
 	std::vector<struct pollfd> events(16);
 	/** This vector maps fds to an index in the events array.
 	 */
-	std::vector<int> fd_mappings(16);
+	std::vector<int> fd_mappings(16, -1);
 }
 
 void SocketEngine::Init()
 {
-	struct rlimit limits;
-	if (!getrlimit(RLIMIT_NOFILE, &limits))
-	{
-		MAX_DESCRIPTORS = limits.rlim_cur;
-	}
-	else
-	{
-		// MAX_DESCRIPTORS is mainly used for display purposes, it's not a problem that getrlimit() failed
-		MAX_DESCRIPTORS = -1;
-	}
+	LookupMaxFds();
 }
 
 void SocketEngine::Deinit()