X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fevent.c;h=a1801723cc5cb7de25e1c102258a0f80500983b9;hb=9e917cc3b614d7a986416e6a2c3ea9ea583adacf;hp=1283edd332b8334fa8fc78a6faedb03d2a397516;hpb=d6b45d005530496e48325a6174ecdd889a17bfc1;p=tinc

diff --git a/src/event.c b/src/event.c
index 1283edd3..a1801723 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,6 +1,6 @@
 /*
     event.c -- I/O, timeout and signal event handling
-    Copyright (C) 2012-2018 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2012-2021 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,12 +18,8 @@
 */
 
 #include "system.h"
-
-#include "dropin.h"
 #include "event.h"
-#include "net.h"
 #include "utils.h"
-#include "xalloc.h"
 
 struct timeval now;
 
@@ -435,12 +431,12 @@ bool event_loop(void) {
 				break;
 			}
 
-			if(result >= event_count - event_offset) {
-				return(false);
+			if(result < WSA_WAIT_EVENT_0 || result >= WSA_WAIT_EVENT_0 + event_count - event_offset) {
+				return false;
 			}
 
 			/* Look up io in the map by index. */
-			event_index = result - event_offset;
+			event_index = result - WSA_WAIT_EVENT_0 + event_offset;
 			io_t *io = io_map[event_index];
 
 			if(io->fd == -1) {