Move localdiscovery variables to mesh.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index c48c0d5b66f458ec9e764a6ce917f28cadd359b1..bf6bab41b9e307cb05c600dd7eabbef3449b02d8 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -128,18 +128,6 @@ static bool read_invitation_key(void) {
        return invitation_key;
 }
 
-static timeout_t keyexpire_timeout;
-
-static void keyexpire_handler(void *data) {
-       regenerate_key();
-       timeout_set(data, &(struct timeval){keylifetime, rand() % 100000});
-}
-
-void regenerate_key(void) {
-       logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
-       send_key_changed();
-}
-
 void load_all_nodes(void) {
        DIR *dir;
        struct dirent *ent;
@@ -188,7 +176,7 @@ char *get_name(void) {
 }
 
 bool setup_myself_reloadable(void) {
-       localdiscovery = true;
+       mesh->localdiscovery = true;
        keylifetime = 3600; // TODO: check if this can be removed as well
        maxtimeout = 900;
        autoconnect = 3;
@@ -328,9 +316,6 @@ bool setup_myself(void) {
        if(!setup_myself_reloadable())
                return false;
 
-       // TODO: check whether this is used at all
-       timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval){keylifetime, rand() % 100000});
-
        /* Compression */
 
        // TODO: drop compression in the packet layer?