Refactor outgoing connection handling.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index c1302d2..b1529e5 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -385,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" SLASH "hosts" SLASH "%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;
@@ -411,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;
 }