j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use libevent to handle key expiration.

Browse source
This commit is contained in:
Guus Sliepen 2007-05-17 23:33:07 +00:00
parent 8852d4407d
commit 563577a147
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/net.c
View file

@ -400,6 +400,17 @@ static void sigalrm_handler(int signal, short events, void *data) {
} }
} }
static void keyexpire_handler(int fd, short events, void *event) {
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
if(myself->cipher)
EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
send_key_changed(broadcast, myself);
event_add(event, &(struct timeval){keylifetime, 0});
}
/* /*
this is where it all happens... this is where it all happens...
*/ */
@ -417,6 +428,7 @@ int main_loop(void)
struct event sigusr2_event; struct event sigusr2_event;
struct event sigwinch_event; struct event sigwinch_event;
struct event sigalrm_event; struct event sigalrm_event;
struct event keyexpire_event;
cp(); cp();
@ -436,6 +448,8 @@ int main_loop(void)
signal_add(&sigwinch_event, NULL); signal_add(&sigwinch_event, NULL);
signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL); signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
signal_add(&sigalrm_event, NULL); signal_add(&sigalrm_event, NULL);
timeout_set(&keyexpire_event, keyexpire_handler, &keyexpire_event);
event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
last_ping_check = now; last_ping_check = now;
@ -480,18 +494,6 @@ int main_loop(void)
if(last_ping_check + pingtimeout < now) { if(last_ping_check + pingtimeout < now) {
check_dead_connections(); check_dead_connections();
last_ping_check = now; last_ping_check = now;
/* Should we regenerate our key? */
if(keyexpires < now) {
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
if(myself->cipher)
EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
} }
} }
@ -503,6 +505,7 @@ int main_loop(void)
signal_del(&sigusr2_event); signal_del(&sigusr2_event);
signal_del(&sigwinch_event); signal_del(&sigwinch_event);
signal_del(&sigalrm_event); signal_del(&sigalrm_event);
event_del(&keyexpire_event);
return 0; return 0;
} }