Refactor outgoing connection handling.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index f580a20..b1529e5 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -339,33 +339,31 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 }
 
 void read_config_options(splay_tree_t *config_tree, const char *prefix) {
-       list_node_t *node, *next;
        size_t prefix_len = prefix ? strlen(prefix) : 0;
 
-       for(node = cmdline_conf->tail; node; node = next) {
-               config_t *orig_cfg, *cfg = (config_t *)node->data;
-               next = node->prev;
+       for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
+               const config_t *cfg = node->data;
+               config_t *new;
 
                if(!prefix) {
                        if(strchr(cfg->variable, '.'))
                                continue;
-                       node->data = NULL;
-                       list_unlink_node(cmdline_conf, node);
                } else {
                        if(strncmp(prefix, cfg->variable, prefix_len) ||
                           cfg->variable[prefix_len] != '.')
                                continue;
-                       /* Because host configuration is parsed again when
-                          reconnecting, nodes must not be freed when a prefix
-                          is given. */
-                       orig_cfg = cfg;
-                       cfg = new_config();
-                       cfg->variable = xstrdup(orig_cfg->variable + prefix_len + 1);
-                       cfg->value = xstrdup(orig_cfg->value);
-                       cfg->file = NULL;
-                       cfg->line = orig_cfg->line;
                }
-               config_add(config_tree, cfg);
+
+               new = new_config();
+               if(prefix)
+                       new->variable = xstrdup(cfg->variable + prefix_len + 1);
+               else
+                       new->variable = xstrdup(cfg->variable);
+               new->value = xstrdup(cfg->value);
+               new->file = NULL;
+               new->line = cfg->line;
+
+               config_add(config_tree, new);
        }
 }
 
@@ -375,7 +373,7 @@ bool read_server_config(void) {
 
        read_config_options(config_tree, NULL);
 
-       xasprintf(&fname, "%s/tinc.conf", confbase);
+       xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
        x = read_config_file(config_tree, fname);
 
        if(!x) {                                /* System error: complain */
@@ -387,14 +385,14 @@ bool read_server_config(void) {
        return x;
 }
 
-bool read_connection_config(connection_t *c) {
+bool read_host_config(splay_tree_t *config_tree, const char *name) {
        char *fname;
        bool x;
 
-       read_config_options(c->config_tree, c->name);
+       read_config_options(config_tree, name);
 
-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-       x = read_config_file(c->config_tree, fname);
+       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+       x = read_config_file(config_tree, fname);
        free(fname);
 
        return x;
@@ -402,7 +400,7 @@ bool read_connection_config(connection_t *c) {
 
 bool append_config_file(const char *name, const char *key, const char *value) {
        char *fname;
-       xasprintf(&fname, "%s/hosts/%s", confbase, name);
+       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 
        FILE *fp = fopen(fname, "a");
 
@@ -413,8 +411,7 @@ bool append_config_file(const char *name, const char *key, const char *value) {
                fclose(fp);
        }
 
-
        free(fname);
 
-       return fp;
+       return fp != NULL;
 }