Working tinc_setup() function in the library

diff --git a/src/libmeshlink.c b/src/libmeshlink.c
index 4f2364bbd3fa9aa2fb237873d7550a91a7722673..047bd3a020a41b0fb51aa5688a10df3a83a4eb54 100644 (file)
--- a/src/libmeshlink.c
+++ b/src/libmeshlink.c
@@ -22,6 +22,7 @@
 #include "ecdsagen.h"
 char *hosts_dir = NULL;
 static char *name = NULL;
+char *tinc_conf = NULL;
 
 
 /*
@@ -193,8 +194,10 @@ int check_port(char *name) {
        return 0;
 }
 //tinc_setup() should basically do what cmd_init() from src/tincctl.c does, except it doesn't have to generate a tinc-up script.
-bool tinc_setup(const char* tinc_conf, const char* name) {
+bool tinc_setup(const char* confbase, const char* name) {
        make_names();
+        xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+        xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
        if(!access(tinc_conf, F_OK)) {
                fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
                return false;

diff --git a/src/libmeshlink.h b/src/libmeshlink.h
index 02a944840b3ab3d92c28605c20b4b950cd3d299a..4b3139157ca9460650e1fd59eb4920e9f6fc5596 100644 (file)
--- a/src/libmeshlink.h
+++ b/src/libmeshlink.h
@@ -29,7 +29,7 @@ extern int check_port(char *name);
 /* OLD: tinc_configuration_t provides all information required to setup "/etc/tinc"
 I think tinc_setup() should basically do what cmd_init() from src/tincctl.c does, except it doesn't have to generate a tinc-up script.
 */
-bool tinc_setup(const char* tinc_conf, const char* name);
+bool tinc_setup(const char* confbase, const char* name);
 
 bool tinc_start(const char* path);