Remove RTT and packet loss estimation code.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 97f3d2a..1ae5edf 100644 (file)
--- 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);