X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=ad4b28b89708e0db5378ac5ec8ef460295c04dce;hb=abe7e94210c8308932a42094fbc260521e727fc9;hp=207f6005cd97967bd3f1c03fc985cbe2fe3b4915;hpb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index 207f6005..ad4b28b8 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -24,16 +24,12 @@
 #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"
 
-splay_tree_t *config_tree;
-
-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;
 
@@ -50,12 +46,13 @@ static int config_compare(const config_t *a, const config_t *b) {
 		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);
 }
 
-void exit_configuration(splay_tree_t ** config_tree) {
-	splay_delete_tree(*config_tree);
+void exit_configuration(splay_tree_t **config_tree) {
+	if(*config_tree)
+		splay_delete_tree(*config_tree);
 	*config_tree = NULL;
 }
 
@@ -128,7 +125,7 @@ bool get_config_bool(const config_t *cfg, bool *result) {
 		return true;
 	}
 
-	logger(DEBUG_ALWAYS, LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
+	logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
@@ -141,12 +138,28 @@ bool get_config_int(const config_t *cfg, int *result) {
 	if(sscanf(cfg->value, "%d", result) == 1)
 		return true;
 
-	logger(DEBUG_ALWAYS, LOG_ERR, "Integer expected for configuration variable %s in %s line %d",
+	logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
 }
 
+bool set_config_int(config_t *cfg, int val)
+{
+	if(!cfg)
+		return false;
+
+	char val_str[1024];
+	snprintf(val_str, sizeof(val_str), "%d", val);
+
+	if(cfg->value)
+		free(cfg->value);
+
+	cfg->value = xstrdup(val_str);
+
+	return true;
+}
+
 bool get_config_string(const config_t *cfg, char **result) {
 	if(!cfg)
 		return false;
@@ -156,6 +169,19 @@ bool get_config_string(const config_t *cfg, char **result) {
 	return true;
 }
 
+bool set_config_string(config_t *cfg, const char* val)
+{
+	if(!cfg)
+		return false;
+
+	if(cfg->value)
+		free(cfg->value);
+
+	cfg->value = xstrdup(val);
+
+	return true;
+}
+
 bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 	struct addrinfo *ai;
 
@@ -169,7 +195,7 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 		return true;
 	}
 
-	logger(DEBUG_ALWAYS, LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d",
+	logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
@@ -224,7 +250,7 @@ config_t *parse_config_line(char *line, const char *fname, int lineno) {
 
 	if(!*value) {
 		const char err[] = "No value for variable";
-		logger(DEBUG_ALWAYS, LOG_ERR, "%s `%s' on line %d while reading config file %s",
+		logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s",
 			err, variable, lineno, fname);
 		return NULL;
 	}
@@ -254,7 +280,7 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 	fp = fopen(fname, "r");
 
 	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+		logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
 		return false;
 	}
 
@@ -294,47 +320,89 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 	return result;
 }
 
-bool read_server_config(void) {
-	char *fname;
+bool write_config_file(const struct splay_tree_t *config_tree, const char *fname)
+{
+	FILE *fp;
+
+	fp = fopen(fname, "w+");
+
+	if(!fp) {
+		logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
+		return false;
+	}
+
+	for splay_each(config_t, cnf, config_tree)
+	{
+		if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable)) {
+			logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+			return false;
+		}
+
+		if(fwrite(" = ", sizeof(char), 3, fp) < 3) {
+			logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+			return false;
+		}
+
+		if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) {
+			logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+			return false;
+		}
+
+		if(fwrite("\n", sizeof(char), 1, fp) < 1) {
+			logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+			return false;
+		}
+	}
+
+	fclose(fp);
+
+	return true;
+}
+
+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(config_tree, 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(mesh, MESHLINK_ERROR, "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 write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name)
+{
+	char filename[PATH_MAX];
+
+	snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	return write_config_file(config_tree, filename);
+}
+
+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(mesh, MESHLINK_ERROR, "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);
+		fprintf(fp, "%s = %s\n", key, value);
 		fclose(fp);
 	}
 
-	free(fname);
-
 	return fp != NULL;
 }