X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=38788f0a3332ce3056db572c3859073ac8bd183d;hb=288990c809f818ccb87d04234b783efd0a2c0276;hp=73d4f7752d982daacd438150a8261fff910a0e64;hpb=f4851be7f5dade24a5f43d366188c033c0f8b426;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 73d4f775..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);
 }
 
 /*
@@ -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 ? : "");