X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fevent.h;h=c6bd207817c50f0bcc6dfa1385b78d58775b35d8;hp=7a3561263fa10bed012e16c5d5f4322b28b563b9;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=5bf4b88666ecafe190e8ed71d6c14c9de8d16e1f

diff --git a/src/event.h b/src/event.h
index 7a356126..c6bd2078 100644
--- a/src/event.h
+++ b/src/event.h
@@ -1,7 +1,10 @@
+#ifndef TINC_EVENT_H
+#define TINC_EVENT_H
+
 /*
     event.h -- header for event.c
-    Copyright (C) 2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2002 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2002-2009 Guus Sliepen <guus@tinc-vpn.org>,
+                  2002-2005 Ivo Timmermans
 
     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
@@ -13,36 +16,32 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: event.h,v 1.1.4.1 2002/02/11 10:05:58 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
-
-#include <time.h>
-#include <avl_tree.h>
+#include "avl_tree.h"
 
-avl_tree_t *event_tree;
+extern avl_tree_t *event_tree;
 
 typedef void (*event_handler_t)(void *);
 
-typedef struct {
-  time_t time;
-  int id;
-  event_handler_t handler;
-  void *data;
+typedef struct event {
+	time_t time;
+	int id;
+	event_handler_t handler;
+	void *data;
 } event_t;
 
 extern void init_events(void);
 extern void exit_events(void);
-extern event_t *new_event(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);
+extern event_t *peek_next_event(void);
 
-#endif /* __TINC_EVENT_H__ */
+#endif