X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_epoll.cpp;h=f0a7c20167dde69c955eddfc40960d2ddeb6d5e3;hb=c0aba5b728b0a921d95ec120aa638dab1520b42f;hp=8548e08248a19d52617ba5be1fc6c743e8b104a3;hpb=0b63ccd0b5cb26883d6becb196fb98e4f95d0397;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 8548e0824..f0a7c2016 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -22,9 +22,8 @@
 #include "exitcodes.h"
 
 #include <sys/epoll.h>
-#include <ulimit.h>
+#include <sys/resource.h>
 #include <iostream>
-#define EP_DELAY 5
 
 /** A specialisation of the SocketEngine class, designed to use linux 2.6 epoll().
  */
@@ -39,8 +38,12 @@ namespace
 
 void SocketEngine::Init()
 {
-	// MAX_DESCRIPTORS is mainly used for display purposes, no problem if ulimit() fails and returns a negative number
-	MAX_DESCRIPTORS = ulimit(4, 0);
+	// MAX_DESCRIPTORS is mainly used for display purposes, no problem if getrlimit() fails
+	struct rlimit limit;
+	if (!getrlimit(RLIMIT_NOFILE, &limit))
+	{
+		MAX_DESCRIPTORS = limit.rlim_cur;
+	}
 
 	// 128 is not a maximum, just a hint at the eventual number of sockets that may be polled,
 	// and it is completely ignored by 2.6.8 and later kernels, except it must be larger than zero.