X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=7f51fe4b46c938e1b9ef552c75d4e3831e9c1681;hb=0b310bf406dbe58afe37fa31156b9ea47599d7be;hp=97f3d2a4a9ea8dc6ce7639b4dfe5e557d6f94147;hpb=7939ee12836bf2ef772f2a6a1e805ee0d64a8e70;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 97f3d2a4..7f51fe4b 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -319,6 +319,8 @@ static void keyexpire_handler(void *data) {
 void regenerate_key(void) {
 	logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
 	send_key_changed();
+	for splay_each(node_t, n, node_tree)
+		n->status.validkey_in = false;
 }
 
 /*
@@ -511,6 +513,7 @@ bool setup_myself_reloadable(void) {
 		myself->options |= OPTION_INDIRECT;
 
 	get_config_bool(lookup_config(config_tree, "UDPDiscovery"), &udp_discovery);
+	get_config_int(lookup_config(config_tree, "UDPDiscoveryKeepaliveInterval"), &udp_discovery_keepalive_interval);
 	get_config_int(lookup_config(config_tree, "UDPDiscoveryInterval"), &udp_discovery_interval);
 	get_config_int(lookup_config(config_tree, "UDPDiscoveryTimeout"), &udp_discovery_timeout);
 
@@ -660,6 +663,9 @@ static bool add_listen_address(char *address, bool bindto) {
 	hint.ai_protocol = IPPROTO_TCP;
 	hint.ai_flags = AI_PASSIVE;
 
+#ifdef HAVE_DECL_RES_INIT
+	res_init();
+#endif
 	int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
 	free(address);