Remove legacy event system.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 4bac3f0..8aecfcd 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 "event.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
@@ -45,6 +44,7 @@
 #include "xalloc.h"
 
 char *myport;
+static struct event device_ev;
 
 bool read_rsa_public_key(connection_t *c)
 {
@@ -447,6 +447,14 @@ bool setup_myself(void)
        if(!setup_device())
                return false;
 
+       event_set(&device_ev, device_fd, EV_READ|EV_PERSIST,
+                         handle_device_data, NULL);
+       if (event_add(&device_ev, NULL) < 0) {
+               logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
+               close_device();
+               return false;
+       }
+
        /* Run tinc-up script to further initialize the tap interface */
        asprintf(&envp[0], "NETNAME=%s", netname ? : "");
        asprintf(&envp[1], "DEVICE=%s", device ? : "");
@@ -492,8 +500,33 @@ bool setup_myself(void)
                listen_socket[listen_sockets].udp =
                        setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
 
-               if(listen_socket[listen_sockets].udp < 0)
+               if(listen_socket[listen_sockets].udp < 0) {
+                       close(listen_socket[listen_sockets].tcp);
+                       continue;
+               }
+
+               event_set(&listen_socket[listen_sockets].ev_tcp,
+                                 listen_socket[listen_sockets].tcp,
+                                 EV_READ|EV_PERSIST,
+                                 handle_new_meta_connection, NULL);
+               if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
+                       logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
+                       close(listen_socket[listen_sockets].tcp);
+                       close(listen_socket[listen_sockets].udp);
+                       continue;
+               }
+
+               event_set(&listen_socket[listen_sockets].ev_udp,
+                                 listen_socket[listen_sockets].udp,
+                                 EV_READ|EV_PERSIST,
+                                 handle_incoming_vpn_data, NULL);
+               if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
+                       logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
+                       close(listen_socket[listen_sockets].tcp);
+                       close(listen_socket[listen_sockets].udp);
+                       event_del(&listen_socket[listen_sockets].ev_tcp);
                        continue;
+               }
 
                ifdebug(CONNECTIONS) {
                        hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
@@ -503,6 +536,11 @@ bool setup_myself(void)
 
                memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
                listen_sockets++;
+
+               if(listen_sockets >= MAXSOCKETS) {
+                       logger(LOG_WARNING, _("Maximum of %d listening sockets reached"), MAXSOCKETS);
+                       break;
+               }
        }
 
        freeaddrinfo(ai);
@@ -530,7 +568,6 @@ bool setup_network_connections(void)
        init_subnets();
        init_nodes();
        init_edges();
-       init_events();
        init_requests();
 
        if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
@@ -572,8 +609,14 @@ void close_network_connections(void)
                next = node->next;
                c = node->data;
 
-               if(c->outgoing)
-                       free(c->outgoing->name), free(c->outgoing), c->outgoing = NULL;
+               if(c->outgoing) {
+                       if(c->outgoing->ai)
+                               freeaddrinfo(c->outgoing->ai);
+                       free(c->outgoing->name);
+                       free(c->outgoing);
+                       c->outgoing = NULL;
+               }
+
                terminate_connection(c, false);
        }
 
@@ -583,6 +626,8 @@ void close_network_connections(void)
        }
 
        for(i = 0; i < listen_sockets; i++) {
+               event_del(&listen_socket[i].ev_tcp);
+               event_del(&listen_socket[i].ev_udp);
                close(listen_socket[i].tcp);
                close(listen_socket[i].udp);
        }
@@ -594,7 +639,6 @@ void close_network_connections(void)
        envp[4] = NULL;
 
        exit_requests();
-       exit_events();
        exit_edges();
        exit_subnets();
        exit_nodes();