From: Etienne Dechamps <etienne@edechamps.fr>
Date: Sat, 28 Jun 2014 14:15:41 +0000 (+0100)
Subject: Make the event loop expose a Windows event interface.
X-Git-Tag: release-1.1pre11~94^2~2
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=2f9a1d4ab5ff51b05a5e8cc41a1528fdeb36c723

Make the event loop expose a Windows event interface.

This allows event loop users to specify Win32 events to wait on,
thus making the event loop more flexible.
---

diff --git a/src/event.c b/src/event.c
index 0e4e2bdf..5e6908f5 100644
--- a/src/event.c
+++ b/src/event.c
@@ -72,9 +72,11 @@ void io_add(io_t *io, io_cb_t cb, void *data, int fd, int flags) {
 
 	io->fd = fd;
 #ifdef HAVE_MINGW
-	io->event = WSACreateEvent();
-	if (io->event == WSA_INVALID_EVENT)
-		abort();
+	if (io->fd != -1) {
+		io->event = WSACreateEvent();
+		if (io->event == WSA_INVALID_EVENT)
+			abort();
+	}
 	event_count++;
 #endif
 	io->cb = cb;
@@ -87,10 +89,19 @@ void io_add(io_t *io, io_cb_t cb, void *data, int fd, int flags) {
 		abort();
 }
 
+#ifdef HAVE_MINGW
+void io_add_event(io_t *io, io_cb_t cb, void *data, WSAEVENT event) {
+	io_add(io, cb, data, -1, 0);
+	io->event = event;
+}
+#endif
+
 void io_set(io_t *io, int flags) {
 	if (flags == io->flags)
 		return;
 	io->flags = flags;
+	if (io->fd == -1)
+		return;
 
 #ifndef HAVE_MINGW
 	if(flags & IO_READ)
@@ -119,7 +130,7 @@ void io_del(io_t *io) {
 
 	io_set(io, 0);
 #ifdef HAVE_MINGW
-	if (WSACloseEvent(io->event) == FALSE)
+	if (io->fd != -1 && WSACloseEvent(io->event) == FALSE)
 		abort();
 	event_count--;
 #endif
@@ -334,13 +345,17 @@ bool event_loop(void) {
 		if (!io)
 			abort();
 
-		WSANETWORKEVENTS network_events;
-		if (WSAEnumNetworkEvents(io->fd, io->event, &network_events) != 0)
-			return false;
-		if (network_events.lNetworkEvents & WRITE_EVENTS)
-			io->cb(io->data, IO_WRITE);
-		if (network_events.lNetworkEvents & READ_EVENTS)
-			io->cb(io->data, IO_READ);
+		if (io->fd == -1) {
+			io->cb(io->data, 0);
+		} else {
+			WSANETWORKEVENTS network_events;
+			if (WSAEnumNetworkEvents(io->fd, io->event, &network_events) != 0)
+				return false;
+			if (network_events.lNetworkEvents & WRITE_EVENTS)
+				io->cb(io->data, IO_WRITE);
+			if (network_events.lNetworkEvents & READ_EVENTS)
+				io->cb(io->data, IO_READ);
+		}
 	}
 #endif
 
diff --git a/src/event.h b/src/event.h
index bebb520d..e4f5cee8 100644
--- a/src/event.h
+++ b/src/event.h
@@ -57,6 +57,9 @@ typedef struct signal_t {
 extern struct timeval now;
 
 extern void io_add(io_t *io, io_cb_t cb, void *data, int fd, int flags);
+#ifdef HAVE_MINGW
+extern void io_add_event(io_t *io, io_cb_t cb, void* data, WSAEVENT event);
+#endif
 extern void io_del(io_t *io);
 extern void io_set(io_t *io, int flags);