X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=c893f1e41c07c5027eda0b9c2cfca33932007fd0;hp=41b3fb944b5827c1bca336346e775a32ca7c2bdd;hb=f80bf14f28925df6eaa56f3ed77adaf418ab9890;hpb=78fc59e994c764d072bf0045177f690a378d1308

diff --git a/src/net.c b/src/net.c
index 41b3fb94..c893f1e4 100644
--- a/src/net.c
+++ b/src/net.c
@@ -251,7 +251,7 @@ static void check_dead_connections(void)
 			} else {
 				if(c->status.remove) {
 					logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
-						   c->name, c->hostname, c->status.value);
+						   c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
 					connection_del(c);
 					continue;
 				}
@@ -413,11 +413,19 @@ int main_loop(void)
 			/* Should we regenerate our key? */
 
 			if(keyexpires < now) {
-				ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
+				avl_node_t *node;
+				node_t *n;
+
+				ifdebug(STATUS) logger(LOG_INFO, _("Expiring symmetric keys"));
+
+				for(node = node_tree->head; node; node = node->next) {
+					n = node->data;
+					if(n->inkey) {
+						free(n->inkey);
+						n->inkey = NULL;
+					}
+				}
 
-				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;
 			}
@@ -457,7 +465,7 @@ int main_loop(void)
 			for(node = connection_tree->head; node; node = node->next) {
 				c = node->data;
 				
-				asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+				xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 				if(stat(fname, &s) || s.st_mtime > last_config_check)
 					terminate_connection(c, c->status.active);
 				free(fname);