X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fevent.c;h=5a1e4f5b7dbf49ba45ea8a2aba63985c44cc3afd;hb=160b7cb5e3e9b7869f6ca38e6a7ab2db39aba979;hp=0dde994f0ff160c0b3e2350fce1b2d9880e08c39;hpb=75c619e372f02f8225d158fd514f01bd04857d3b;p=tinc

diff --git a/src/event.c b/src/event.c
index 0dde994f..5a1e4f5b 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 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2012-2013 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
@@ -52,13 +52,8 @@ static int timeout_compare(const timeout_t *a, const timeout_t *b) {
 	return 0;
 }
 
-static int signal_compare(const signal_t *a, const signal_t *b) {
-	return a->signum - b->signum;
-}
-
 static splay_tree_t io_tree = {.compare = (splay_compare_t)io_compare};
 static splay_tree_t timeout_tree = {.compare = (splay_compare_t)timeout_compare};
-static splay_tree_t signal_tree = {.compare = (splay_compare_t)signal_compare};
 
 void io_add(io_t *io, io_cb_t cb, void *data, int fd, int flags) {
 	if(io->cb)
@@ -130,8 +125,13 @@ void timeout_del(timeout_t *timeout) {
 }
 
 #ifndef HAVE_MINGW
+static int signal_compare(const signal_t *a, const signal_t *b) {
+	return a->signum - b->signum;
+}
+
 static io_t signalio;
 static int pipefd[2] = {-1, -1};
+static splay_tree_t signal_tree = {.compare = (splay_compare_t)signal_compare};
 
 static void signal_handler(int signum) {
 	unsigned char num = signum;
@@ -245,6 +245,12 @@ bool event_loop(void) {
 	return true;
 }
 
+void event_flush_output(void) {
+	for splay_each(io_t, io, &io_tree)
+		if(FD_ISSET(io->fd, &writefds))
+			io->cb(io->data, IO_WRITE);
+}
+
 void event_exit(void) {
 	running = false;
 }