X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=38788f0a3332ce3056db572c3859073ac8bd183d;hb=708825e4b229a4a1e182e682e2d1021fa2765396;hp=c51c133631f8d800b06f2644d086628d65fc46c2;hpb=886a6f61a1f4cc48a77b42d10f34f9126377d904;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index c51c1336..38788f0a 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -139,20 +139,17 @@ bool read_rsa_private_key() {
 
 static struct event keyexpire_event;
 
-static void keyexpire_handler(int fd, short events, void *data) {
+static void keyexpire_handler(void *data) {
 	regenerate_key();
 }
 
 void regenerate_key() {
-	if(timeout_initialized(&keyexpire_event)) {
-		ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
-		event_del(&keyexpire_event);
-		send_key_changed(broadcast, myself);
-	} else {
-		timeout_set(&keyexpire_event, keyexpire_handler, NULL);
-	}
-
-	event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
+	ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
+	event_del(&keyexpire_event);
+	send_key_changed(broadcast, myself);
+	keyexpire_event.time = time(NULL) + keylifetime;
+	keyexpire_event.handler = keyexpire_handler;
+	event_add(&keyexpire_event);
 }
 
 /*
@@ -415,7 +412,7 @@ bool setup_myself(void) {
 
 	/* Check if we want to use message authentication codes... */
 
-	if(!get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
+	if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
 		digest = xstrdup("sha1");
 
 	int maclength = 4;
@@ -460,16 +457,6 @@ bool setup_myself(void) {
 	if(!setup_device())
 		return false;
 
-	if(device_fd >= 0) {
-		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 */
 	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
 	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
@@ -520,21 +507,15 @@ bool setup_myself(void) {
 			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_ERR, "event_add failed: %s", strerror(errno));
+		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+
+		if(!thread_create(&listen_socket[listen_sockets].tcp_thread, handle_new_meta_connection, &listen_socket[listen_sockets])) {
+			logger(LOG_ERR, "thread_create failed: %s", strerror(errno));
 			abort();
 		}
 
-		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_ERR, "event_add failed: %s", strerror(errno));
+		if(!thread_create(&listen_socket[listen_sockets].udp_thread, handle_incoming_vpn_data, &listen_socket[listen_sockets])) {
+			logger(LOG_ERR, "thread_create failed: %s", strerror(errno));
 			abort();
 		}
 
@@ -544,7 +525,6 @@ bool setup_myself(void) {
 			free(hostname);
 		}
 
-		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
 		listen_sockets++;
 
 		if(listen_sockets >= MAXSOCKETS) {
@@ -621,10 +601,10 @@ 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);
+		thread_destroy(&listen_socket[i].tcp_thread);
+		thread_destroy(&listen_socket[i].udp_thread);
 	}
 
 	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");