Move several variables to mesh.

[meshlink] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 207f6005cd97967bd3f1c03fc985cbe2fe3b4915..a1c0a3df600f80ecbaee2df8807b98396583495f 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -24,13 +24,12 @@
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "netutl.h"             /* for str2address */
 #include "protocol.h"
 #include "utils.h"              /* for cp */
 #include "xalloc.h"
 
-splay_tree_t *config_tree;
-
 int pinginterval = 0;           /* seconds between pings */
 int pingtimeout = 0;            /* seconds to wait for response */
 
@@ -50,11 +49,11 @@ static int config_compare(const config_t *a, const config_t *b) {
                return a->file ? strcmp(a->file, b->file) : 0;
 }
 
-void init_configuration(splay_tree_t ** config_tree) {
+void init_configuration(splay_tree_t **config_tree) {
        *config_tree = splay_alloc_tree((splay_compare_t) config_compare, (splay_action_t) free_config);
 }
 
-void exit_configuration(splay_tree_t ** config_tree) {
+void exit_configuration(splay_tree_t **config_tree) {
        splay_delete_tree(*config_tree);
        *config_tree = NULL;
 }
@@ -298,9 +297,9 @@ bool read_server_config(void) {
        char *fname;
        bool x;
 
-       xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
+       xasprintf(&fname, "%s" SLASH "tinc.conf", mesh->confbase);
        errno = 0;
-       x = read_config_file(config_tree, fname);
+       x = read_config_file(mesh->config, fname);
 
        if(!x && errno)
                logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
@@ -314,7 +313,7 @@ bool read_host_config(splay_tree_t *config_tree, const char *name) {
        char *fname;
        bool x;
 
-       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
        x = read_config_file(config_tree, fname);
        free(fname);
 
@@ -323,7 +322,7 @@ bool read_host_config(splay_tree_t *config_tree, const char *name) {
 
 bool append_config_file(const char *name, const char *key, const char *value) {
        char *fname;
-       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
 
        FILE *fp = fopen(fname, "a");