X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_select.cpp;h=bc7b5c63fcd4aa77365eef479651e17b6fcc6cfe;hb=635cb9d65f6d7f6758ae8ed874da00c8d94b6e39;hp=79f1b36351cc5fe3120a9698d8ffbf2ab62bae37;hpb=efe77ba63b1e519fc4d563bd9b599277c4bd96e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 79f1b3635..bc7b5c63f 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014 Adam <Adam@anope.org>
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017, 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2011, 2014 Adam <Adam@anope.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -20,7 +26,6 @@
 
 
 #include "inspircd.h"
-#include "socketengine.h"
 
 #ifndef _WIN32
 #include <sys/select.h>
@@ -36,7 +41,13 @@ namespace
 
 void SocketEngine::Init()
 {
-	MAX_DESCRIPTORS = FD_SETSIZE;
+#ifdef _WIN32
+	// Set up winsock.
+	WSADATA wsadata;
+	WSAStartup(MAKEWORD(2,2), &wsadata);
+#endif
+
+	MaxSetSize = FD_SETSIZE;
 
 	FD_ZERO(&ReadSet);
 	FD_ZERO(&WriteSet);
@@ -54,7 +65,11 @@ void SocketEngine::RecoverFromFork()
 bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 {
 	int fd = eh->GetFd();
-	if ((fd < 0) || (fd > GetMaxFds() - 1))
+
+	if (fd < 0)
+		return false;
+
+	if (static_cast<size_t>(fd) >= GetMaxFds())
 		return false;
 
 	if (!SocketEngine::AddFdRef(eh))
@@ -74,7 +89,10 @@ void SocketEngine::DelFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 
-	if ((fd < 0) || (fd > GetMaxFds() - 1))
+	if (fd < 0)
+		return;
+
+	if (static_cast<size_t>(fd) >= GetMaxFds())
 		return;
 
 	SocketEngine::DelFdRef(eh);
@@ -111,7 +129,9 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 
 int SocketEngine::DispatchEvents()
 {
-	static timeval tval = { 1, 0 };
+	timeval tval;
+	tval.tv_sec = 1;
+	tval.tv_usec = 0;
 
 	fd_set rfdset = ReadSet, wfdset = WriteSet, errfdset = ErrSet;
 
@@ -140,26 +160,24 @@ int SocketEngine::DispatchEvents()
 			if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
 				errcode = errno;
 
-			ev->HandleEvent(EVENT_ERROR, errcode);
+			ev->OnEventHandlerError(errcode);
 			continue;
 		}
 
 		if (has_read)
 		{
-			stats.ReadEvents++;
 			ev->SetEventMask(ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
-			ev->HandleEvent(EVENT_READ);
+			ev->OnEventHandlerRead();
 			if (ev != GetRef(i))
 				continue;
 		}
 
 		if (has_write)
 		{
-			stats.WriteEvents++;
 			int newmask = (ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
 			SocketEngine::OnSetEvent(ev, ev->GetEventMask(), newmask);
 			ev->SetEventMask(newmask);
-			ev->HandleEvent(EVENT_WRITE);
+			ev->OnEventHandlerWrite();
 		}
 	}