X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fevent.h;h=0ff8e01c0ca7a0804351f88aaee7971b0983d526;hp=345a5f913b18d3aca324644f41b9c8c6d294d9bd;hb=d4410d0cce40929db9a0ce7042ef962f1867234d;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee

diff --git a/src/event.h b/src/event.h
index 345a5f91..0ff8e01c 100644
--- a/src/event.h
+++ b/src/event.h
@@ -1,7 +1,6 @@
 /*
-    event.h -- header for event.c
-    Copyright (C) 2002-2009 Guus Sliepen <guus@tinc-vpn.org>,
-                  2002-2005 Ivo Timmermans
+    event.h -- I/O, timeout and signal event handling
+    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
@@ -21,26 +20,57 @@
 #ifndef __TINC_EVENT_H__
 #define __TINC_EVENT_H__
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 
-extern avl_tree_t *event_tree;
+#define IO_READ 1
+#define IO_WRITE 2
 
-typedef void (*event_handler_t)(void *);
+typedef void (*io_cb_t)(void *data, int flags);
+typedef void (*timeout_cb_t)(void *data);
+typedef void (*signal_cb_t)(void *data);
 
-typedef struct {
-	time_t time;
-	int id;
-	event_handler_t handler;
+typedef struct io_t {
+	int fd;
+	int flags;
+#ifdef HAVE_MINGW
+	WSAEVENT event;
+#endif
+	io_cb_t cb;
 	void *data;
-} event_t;
-
-extern void init_events(void);
-extern void exit_events(void);
-extern void expire_events(void);
-extern event_t *new_event(void) __attribute__ ((__malloc__));
-extern void free_event(event_t *);
-extern void event_add(event_t *);
-extern void event_del(event_t *);
-extern event_t *get_expired_event(void);
-
-#endif							/* __TINC_EVENT_H__ */
+	splay_node_t node;
+} io_t;
+
+typedef struct timeout_t {
+	struct timeval tv;
+	timeout_cb_t cb;
+	void *data;
+	splay_node_t node;
+} timeout_t;
+
+typedef struct signal_t {
+	int signum;
+	signal_cb_t cb;
+	void *data;
+	splay_node_t node;
+} 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);
+
+extern void timeout_add(timeout_t *timeout, timeout_cb_t cb, void *data, struct timeval *tv);
+extern void timeout_del(timeout_t *timeout);
+extern void timeout_set(timeout_t *timeout, struct timeval *tv);
+
+extern void signal_add(signal_t *sig, signal_cb_t cb, void *data, int signum);
+extern void signal_del(signal_t *sig);
+
+extern bool event_loop(void);
+extern void event_exit(void);
+
+#endif