Remove legacy event system.

diff --git a/src/Makefile.am b/src/Makefile.am
index c9c1ac90a99c355fc127dfb16cac95316a0f60cf..ed204ae4c2cf42552a8519c88f05c8a16edd67e0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ sbin_PROGRAMS = tincd
 
 EXTRA_DIST = linux/device.c bsd/device.c solaris/device.c cygwin/device.c mingw/device.c mingw/common.h raw_socket/device.c uml_socket/device.c
 
-tincd_SOURCES = conf.c connection.c edge.c tevent.c graph.c logger.c meta.c net.c net_packet.c net_setup.c     \
+tincd_SOURCES = conf.c connection.c edge.c graph.c logger.c meta.c net.c net_packet.c net_setup.c      \
        net_socket.c netutl.c node.c process.c protocol.c protocol_auth.c protocol_edge.c protocol_misc.c       \
        protocol_key.c protocol_subnet.c route.c subnet.c tincd.c
 
@@ -15,7 +15,7 @@ DEFAULT_INCLUDES =
 
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
 
-noinst_HEADERS = conf.h connection.h device.h edge.h tevent.h graph.h logger.h meta.h net.h netutl.h node.h process.h  \
+noinst_HEADERS = conf.h connection.h device.h edge.h graph.h logger.h meta.h net.h netutl.h node.h process.h   \
        protocol.h route.h subnet.h
 
 LIBS = @LIBS@ @LIBINTL@

diff --git a/src/net.c b/src/net.c
index 6243bdd29d4e38cb4d3ed1d6b16d9b715f396ca4..f9f6bd0a7c6958dfbcf0b35238dd93b5c6afa7e9 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -29,7 +29,6 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "tevent.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -346,7 +345,6 @@ int main_loop(void)
        struct timeval tv;
        int r;
        time_t last_ping_check;
-       tevent_t *event;
        struct event timeout;
        struct event sighup_event;
 
@@ -422,18 +420,11 @@ int main_loop(void)
                        }
                }
 
-
-               while((event = get_expired_tevent())) {
-                       event->handler(event->data);
-                       free_tevent(event);
-               }
-
                if(sigalrm) {
                        logger(LOG_INFO, _("Flushing event queue"));
-                       flush_tevents();
+                       // TODO: do this another way
                        sigalrm = false;
                }
-
        }
 
        signal_del(&sighup_event);

diff --git a/src/net_setup.c b/src/net_setup.c
index eeea61a20e13fc3a00a78d6f017f82cd92c8b367..8aecfcdcd5d3603a496647a5f7421359288ba2b6 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -32,7 +32,6 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "tevent.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
@@ -565,7 +564,6 @@ bool setup_network_connections(void)
 
        now = time(NULL);
 
-       init_tevents();
        init_connections();
        init_subnets();
        init_nodes();
@@ -645,7 +643,6 @@ void close_network_connections(void)
        exit_subnets();
        exit_nodes();
        exit_connections();
-       exit_tevents();
 
        execute_script("tinc-down", envp);
 

diff --git a/src/node.h b/src/node.h
index a612e93ba404ca4840e2d4020574b05010338fc7..5b5cc251e25786977c1974489bb58959f2e77f4d 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -25,7 +25,6 @@
 
 #include "avl_tree.h"
 #include "connection.h"
-#include "tevent.h"
 #include "list.h"
 #include "subnet.h"
 

diff --git a/src/tevent.c b/src/tevent.c
deleted file mode 100644 (file)
index bdda639..0000000
--- a/src/tevent.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-    event.c -- event queue
-    Copyright (C) 2002-2006 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    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$
-*/
-
-#include "system.h"
-
-#include "avl_tree.h"
-#include "tevent.h"
-#include "utils.h"
-#include "xalloc.h"
-
-avl_tree_t *tevent_tree;
-extern time_t now;
-
-int id;
-
-static int tevent_compare(const tevent_t *a, const tevent_t *b)
-{
-       if(a->time > b->time)
-               return 1;
-
-       if(a->time < b->time)
-               return -1;
-
-       return a->id - b->id;
-}
-
-void init_tevents(void)
-{
-       cp();
-
-       tevent_tree = avl_alloc_tree((avl_compare_t) tevent_compare, NULL);
-}
-
-void exit_tevents(void)
-{
-       cp();
-
-       avl_delete_tree(tevent_tree);
-}
-
-void flush_tevents(void)
-{
-       avl_tree_t *to_flush;
-       tevent_t *event;
-
-       /*
-        * Events can be inserted from event handlers, so only flush events
-        * already in the priority queue.
-        */
-
-       cp();
-
-       to_flush = tevent_tree;
-       init_tevents();
-       while (to_flush->head) {
-               event = to_flush->head->data;
-               event->handler(event->data);
-               avl_delete(to_flush, event);
-       }
-       avl_delete_tree(to_flush);
-}
-
-tevent_t *new_tevent(void)
-{
-       cp();
-
-       return xmalloc_and_zero(sizeof(tevent_t));
-}
-
-void free_tevent(tevent_t *event)
-{
-       cp();
-
-       free(event);
-}
-
-void tevent_add(tevent_t *event)
-{
-       cp();
-
-       event->id = ++id;
-       avl_insert(tevent_tree, event);
-}
-
-void tevent_del(tevent_t *event)
-{
-       cp();
-
-       avl_delete(tevent_tree, event);
-}
-
-tevent_t *get_expired_tevent(void)
-{
-       tevent_t *event;
-
-       cp();
-
-       if(tevent_tree->head) {
-               event = tevent_tree->head->data;
-
-               if(event->time < now) {
-                       tevent_del(event);
-                       return event;
-               }
-       }
-
-       return NULL;
-}

diff --git a/src/tevent.h b/src/tevent.h
deleted file mode 100644 (file)
index 8f5cfd8..0000000
--- a/src/tevent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    event.h -- header for event.c
-    Copyright (C) 2002-2006 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    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$
-*/
-
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
-
-#include "avl_tree.h"
-
-extern avl_tree_t *tevent_tree;
-
-typedef void (*event_handler_t)(void *);
-
-typedef struct {
-       time_t time;
-       int id;
-       event_handler_t handler;
-       void *data;
-} tevent_t;
-
-extern void init_tevents(void);
-extern void exit_tevents(void);
-extern void flush_tevents(void);
-extern tevent_t *new_tevent(void) __attribute__ ((__malloc__));
-extern void free_tevent(tevent_t *);
-extern void tevent_add(tevent_t *);
-extern void tevent_del(tevent_t *);
-extern tevent_t *get_expired_tevent(void);
-
-#endif                                                 /* __TINC_EVENT_H__ */