Stop using global variable mesh in net_setup.[ch].

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index 878a2f99b5e0de984d34762bb0775db0650ec18d..d271a3466c08bbd721873bcddbfe0bfb711391c8 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -276,7 +276,7 @@ int reload_configuration(void) {
        exit_configuration(&mesh->config);
        init_configuration(&mesh->config);
 
-       if(!read_server_config()) {
+       if(!read_server_config(mesh)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file.");
                return EINVAL;
        }
@@ -286,7 +286,7 @@ int reload_configuration(void) {
 
        /* Parse some options that are allowed to be changed while tinc is running */
 
-       setup_myself_reloadable();
+       setup_myself_reloadable(mesh);
 
        /* Try to make outgoing connections */