A couple missed tevent things.

(Sorry; had a couple changes queued.)

diff --git a/src/net.c b/src/net.c
index 9156147dd73f4e162f90f024ad96ff63bd952394..e9c7020a488cf3ac83b0843b845118165e894e4f 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -422,14 +422,14 @@ int main_loop(void)
                }
 
 
-               while((event = get_expired_event())) {
+               while((event = get_expired_tevent())) {
                        event->handler(event->data);
-                       free_event(event);
+                       free_tevent(event);
                }
 
                if(sigalrm) {
                        logger(LOG_INFO, _("Flushing event queue"));
-                       flush_events();
+                       flush_tevents();
                        sigalrm = false;
                }
 

diff --git a/src/net_setup.c b/src/net_setup.c
index 84171e722ecc910c8ee50bd274f12290687e7281..0c399bb6cecba5802af1f2363ec6f7f594341156 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -526,7 +526,7 @@ bool setup_network_connections(void)
 
        now = time(NULL);
 
-       init_events();
+       init_tevents();
        init_connections();
        init_subnets();
        init_nodes();
@@ -604,7 +604,7 @@ void close_network_connections(void)
        exit_subnets();
        exit_nodes();
        exit_connections();
-       exit_events();
+       exit_tevents();
 
        execute_script("tinc-down", envp);
 

diff --git a/src/node.c b/src/node.c
index ec6815a61f41607cd8332a79cba43935f68efc4f..d90e00a09ab3bc8442757b747102f52a51f396dc 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -108,7 +108,7 @@ void free_node(node_t *n)
 
        if(n->mtuevent) {
                tevent_del(n->mtuevent);
-               free_event(n->mtuevent);
+               free_tevent(n->mtuevent);
        }
        
        if(n->hostname)