Move key regeneration handling to net_setup.c.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 57794f9..596b9d5 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -52,7 +52,6 @@
 #endif
 
 int keylifetime = 0;
-int keyexpires = 0;
 EVP_CIPHER_CTX packet_ctx;
 static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
 
@@ -98,7 +97,7 @@ static void send_mtu_probe_handler(int fd, short events, void *data) {
 }
 
 void send_mtu_probe(node_t *n) {
-       if(!n->mtuevent.ev_callback)
+       if(!timeout_initialized(&n->mtuevent))
                timeout_set(&n->mtuevent, send_mtu_probe_handler, n);
        send_mtu_probe_handler(0, 0, n);
 }
@@ -248,7 +247,7 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
                n->received_seqno = inpkt->seqno;
                        
        if(n->received_seqno > MAX_SEQNO)
-               keyexpires = 0;
+               regenerate_key();
 
        /* Decompress the packet */