X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_poll.cpp;h=d25f21d9462d8b40bec004d2ba956c7f25b319bf;hb=78db7544d26cdeffeb2bd8045529fe90bd5d852d;hp=8fa0a13c5ad256958f9bde0f843d2b5aac5b6084;hpb=72a6b6077644abbdad1a61acbbd07bd01ba1b9bd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 8fa0a13c5..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,13 +23,7 @@
  */
 
 
-#include <iostream>
-#include <vector>
-#include <string>
-#include <map>
-#include "exitcodes.h"
 #include "inspircd.h"
-#include "socketengine.h"
 
 #include <sys/poll.h>
 #include <sys/resource.h>
@@ -41,22 +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
-	{
-		ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Can't determine maximum number of open sockets: %s", strerror(errno));
-		std::cout << "ERROR: Can't determine maximum number of open sockets: " << strerror(errno) << std::endl;
-		ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
-	}
+	LookupMaxFds();
 }
 
 void SocketEngine::Deinit()
@@ -80,9 +66,9 @@ static int mask_to_poll(int event_mask)
 bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 {
 	int fd = eh->GetFd();
-	if ((fd < 0) || (fd > GetMaxFds() - 1))
+	if (fd < 0)
 	{
-		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd);
 		return false;
 	}
 
@@ -128,9 +114,9 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 void SocketEngine::DelFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+	if (fd < 0)
 	{
-		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd);
 		return;
 	}
 
@@ -174,7 +160,7 @@ int SocketEngine::DispatchEvents()
 	int processed = 0;
 	ServerInstance->UpdateTime();
 
-	for (int index = 0; index < CurrentSetSize && processed < i; index++)
+	for (size_t index = 0; index < CurrentSetSize && processed < i; index++)
 	{
 		struct pollfd& pfd = events[index];
 
@@ -191,7 +177,7 @@ int SocketEngine::DispatchEvents()
 
 		if (revents & POLLHUP)
 		{
-			eh->HandleEvent(EVENT_ERROR, 0);
+			eh->OnEventHandlerError(0);
 			continue;
 		}
 
@@ -202,14 +188,14 @@ int SocketEngine::DispatchEvents()
 			int errcode;
 			if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
 				errcode = errno;
-			eh->HandleEvent(EVENT_ERROR, errcode);
+			eh->OnEventHandlerError(errcode);
 			continue;
 		}
 
 		if (revents & POLLIN)
 		{
 			eh->SetEventMask(eh->GetEventMask() & ~FD_READ_WILL_BLOCK);
-			eh->HandleEvent(EVENT_READ);
+			eh->OnEventHandlerRead();
 			if (eh != GetRef(fd))
 				// whoops, deleted out from under us
 				continue;
@@ -223,7 +209,7 @@ int SocketEngine::DispatchEvents()
 
 			// The vector could've been resized, reference can be invalid by now; don't use it
 			events[index].events = mask_to_poll(mask);
-			eh->HandleEvent(EVENT_WRITE);
+			eh->OnEventHandlerWrite();
 		}
 	}