Move config_tree to mesh->config.

diff --git a/src/Makefile.am b/src/Makefile.am
index 021d6b8ef537f2b016ceed061c44169c038022eb..6f7cd7956d512d8cb73fe2f6ece355745d913ff7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,7 +94,6 @@ libmeshlink_la_SOURCES = \
        splay_tree.c splay_tree.h \
        sptps.c sptps.h \
        system.h \
        splay_tree.c splay_tree.h \
        sptps.c sptps.h \
        system.h \

-       tincd.c \

        utils.c utils.h \
        xalloc.h \
        $(ed25519_SOURCES) \
        utils.c utils.h \
        xalloc.h \
        $(ed25519_SOURCES) \

diff --git a/src/conf.c b/src/conf.c
index 207f6005cd97967bd3f1c03fc985cbe2fe3b4915..360053f94b0181fe94ed9f5131df16c0ca75b599 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -24,13 +24,12 @@
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
 #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"
 
 #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 */
 
 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;
 }
 
                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);
 }
 
        *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;
 }
        splay_delete_tree(*config_tree);
        *config_tree = NULL;
 }


@@ -300,7 +299,7 @@ bool read_server_config(void) {
 
        xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
        errno = 0;
 
        xasprintf(&fname, "%s" SLASH "tinc.conf", 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));
 
        if(!x && errno)
                logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));

diff --git a/src/conf.h b/src/conf.h
index 63097c3f4301f36b5901d960ebe30105d0c967f2..015bba5bbd6fccc0c97cfe2388dff3db6bedc551 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -30,8 +30,6 @@ typedef struct config_t {
        int line;
 } config_t;
 
        int line;
 } config_t;
 

-extern struct splay_tree_t *config_tree;
-

 extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
 extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;

diff --git a/src/net.c b/src/net.c
index 98cc8beded0272775c7f4fccdc1c27a730a8244f..7a176ef2262a370e53a06bf885f5784985f9ae66 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -283,8 +283,8 @@ int reload_configuration(void) {
 
        /* Reread our own configuration file */
 
 
        /* Reread our own configuration file */
 

-       exit_configuration(&config_tree);
-       init_configuration(&config_tree);
+       exit_configuration(&mesh->config);
+       init_configuration(&mesh->config);

 
        if(!read_server_config()) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file.");
 
        if(!read_server_config()) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file.");


@@ -292,7 +292,7 @@ int reload_configuration(void) {
        }
 
        xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, mesh->self->name);
        }
 
        xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, mesh->self->name);

-       read_config_file(config_tree, fname);
+       read_config_file(mesh->config, fname);

        free(fname);
 
        /* Parse some options that are allowed to be changed while tinc is running */
        free(fname);
 
        /* Parse some options that are allowed to be changed while tinc is running */

diff --git a/src/net_setup.c b/src/net_setup.c
index 1d2d47214136da8a1baccb8f4ef2cd53add63b1d..4c19e268a524fe38508873b2d8bd11e042129b03 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -181,7 +181,7 @@ void load_all_nodes(void) {
 char *get_name(void) {
        char *name = NULL;
 
 char *get_name(void) {
        char *name = NULL;
 

-       get_config_string(lookup_config(config_tree, "Name"), &name);
+       get_config_string(lookup_config(mesh->config, "Name"), &name);

 
        if(!name)
                return NULL;
 
        if(!name)
                return NULL;


@@ -303,9 +303,9 @@ bool setup_myself(void) {
        mesh->self->connection = new_connection();
        mesh->self->name = name;
        mesh->self->connection->name = xstrdup(name);
        mesh->self->connection = new_connection();
        mesh->self->name = name;
        mesh->self->connection->name = xstrdup(name);

-       read_host_config(config_tree, name);
+       read_host_config(mesh->config, name);

 
 

-       if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
+       if(!get_config_string(lookup_config(mesh->config, "Port"), &myport))

                myport = xstrdup("655");
        else
                port_specified = true;
                myport = xstrdup("655");
        else
                port_specified = true;

diff --git a/src/net_socket.c b/src/net_socket.c
index ecf2c26ba9a9c8c544458d31f71795bf5bfa4f56..80fe84cac2876aff23b5e7826a5df7fdae3bb84a 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -654,7 +654,7 @@ void try_outgoing_connections(void) {
        /* Make sure there is one outgoing_t in the list for each ConnectTo. */
 
        // TODO: Drop support for ConnectTo since AutoConnect is now always on?
        /* Make sure there is one outgoing_t in the list for each ConnectTo. */
 
        // TODO: Drop support for ConnectTo since AutoConnect is now always on?

-       for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+       for(config_t *cfg = lookup_config(mesh->config, "ConnectTo"); cfg; cfg = lookup_config_next(mesh->config, cfg)) {

                char *name;
                get_config_string(cfg, &name);
 
                char *name;
                get_config_string(cfg, &name);