X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=a53db04604ed10bc8725053a38bb9d33edfb84b8;hb=3e8459f81c4e7e18d645cc2f4b7e24900ed33e04;hp=360053f94b0181fe94ed9f5131df16c0ca75b599;hpb=8fc838f88fad6d6a632f9d4e6906e31931c765e3;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index 360053f9..a53db046 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -30,9 +30,6 @@
 #include "utils.h"              /* for cp */
 #include "xalloc.h"
 
-int pinginterval = 0;           /* seconds between pings */
-int pingtimeout = 0;            /* seconds to wait for response */
-
 static int config_compare(const config_t *a, const config_t *b) {
 	int result;
 
@@ -293,47 +290,43 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 	return result;
 }
 
-bool read_server_config(void) {
-	char *fname;
+bool read_server_config(meshlink_handle_t *mesh) {
+	char filename[PATH_MAX];
 	bool x;
 
-	xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
+	snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
 	errno = 0;
-	x = read_config_file(mesh->config, fname);
+	x = read_config_file(mesh->config, filename);
 
 	if(!x && errno)
-		logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
-
-	free(fname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", filename, strerror(errno));
 
 	return x;
 }
 
-bool read_host_config(splay_tree_t *config_tree, const char *name) {
-	char *fname;
+bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const char *name) {
+	char filename[PATH_MAX];
 	bool x;
 
-	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
-	x = read_config_file(config_tree, fname);
-	free(fname);
+	snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	x = read_config_file(config_tree, filename);
 
 	return x;
 }
 
-bool append_config_file(const char *name, const char *key, const char *value) {
-	char *fname;
-	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
+	char filename[PATH_MAX];
+	snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
 
-	FILE *fp = fopen(fname, "a");
+	FILE *fp = fopen(filename, "a");
 
 	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", filename, strerror(errno));
 	} else {
 		fprintf(fp, "\n# The following line was automatically added by tinc\n%s = %s\n", key, value);
 		fclose(fp);
 	}
 
-	free(fname);
 
 	return fp != NULL;
 }