X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=742e81d8e39cb1f6d7c21a02e48a416688127927;hb=ec02aca3d7888f072c5c0d52ba6b5c37ed42b69e;hp=af8b0b0e20ba5e44a3c9953e5562577ef17eafd8;hpb=c65427deabcee4cef1cdf83a129b50e94f645dec;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index af8b0b0e..742e81d8 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -36,15 +36,11 @@ static int config_compare(const config_t *a, const config_t *b) {
 
 	result = strcasecmp(a->variable, b->variable);
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
-	result = a->line - b->line;
-
-	if(result)
-		return result;
-	else
-		return a->file ? strcmp(a->file, b->file) : 0;
+	return result = a->line - b->line;
 }
 
 void init_configuration(splay_tree_t **config_tree) {
@@ -52,8 +48,10 @@ void init_configuration(splay_tree_t **config_tree) {
 }
 
 void exit_configuration(splay_tree_t **config_tree) {
-	if(*config_tree)
+	if(*config_tree) {
 		splay_delete_tree(*config_tree);
+	}
+
 	*config_tree = NULL;
 }
 
@@ -62,15 +60,8 @@ config_t *new_config(void) {
 }
 
 void free_config(config_t *cfg) {
-	if(cfg->variable)
-		free(cfg->variable);
-
-	if(cfg->value)
-		free(cfg->value);
-
-	if(cfg->file)
-		free(cfg->file);
-
+	free(cfg->variable);
+	free(cfg->value);
 	free(cfg);
 }
 
@@ -82,16 +73,17 @@ config_t *lookup_config(splay_tree_t *config_tree, char *variable) {
 	config_t cfg, *found;
 
 	cfg.variable = variable;
-	cfg.file = NULL;
 	cfg.line = 0;
 
 	found = splay_search_closest_greater(config_tree, &cfg);
 
-	if(!found)
+	if(!found) {
 		return NULL;
+	}
 
-	if(strcasecmp(found->variable, variable))
+	if(strcasecmp(found->variable, variable)) {
 		return NULL;
+	}
 
 	return found;
 }
@@ -106,8 +98,9 @@ config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *cfg) {
 		if(node->next) {
 			found = node->next->data;
 
-			if(!strcasecmp(found->variable, cfg->variable))
+			if(!strcasecmp(found->variable, cfg->variable)) {
 				return found;
+			}
 		}
 	}
 
@@ -115,8 +108,9 @@ config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *cfg) {
 }
 
 bool get_config_bool(const config_t *cfg, bool *result) {
-	if(!cfg)
+	if(!cfg) {
 		return false;
+	}
 
 	if(!strcasecmp(cfg->value, "yes")) {
 		*result = true;
@@ -126,35 +120,38 @@ bool get_config_bool(const config_t *cfg, bool *result) {
 		return true;
 	}
 
-	logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
-		   cfg->variable, cfg->file, cfg->line);
+	logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in line %d",
+	       cfg->variable, cfg->line);
 
 	return false;
 }
 
 bool get_config_int(const config_t *cfg, int *result) {
-	if(!cfg)
+	if(!cfg) {
 		return false;
+	}
 
-	if(sscanf(cfg->value, "%d", result) == 1)
+	if(sscanf(cfg->value, "%d", result) == 1) {
 		return true;
+	}
 
-	logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in %s line %d",
-		   cfg->variable, cfg->file, cfg->line);
+	logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in line %d",
+	       cfg->variable, cfg->line);
 
 	return false;
 }
 
-bool set_config_int(config_t *cfg, int val)
-{
-	if(!cfg)
+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)
+	if(cfg->value) {
 		free(cfg->value);
+	}
 
 	cfg->value = xstrdup(val_str);
 
@@ -162,21 +159,23 @@ bool set_config_int(config_t *cfg, int val)
 }
 
 bool get_config_string(const config_t *cfg, char **result) {
-	if(!cfg)
+	if(!cfg) {
 		return false;
+	}
 
 	*result = xstrdup(cfg->value);
 
 	return true;
 }
 
-bool set_config_string(config_t *cfg, const char* val)
-{
-	if(!cfg)
+bool set_config_string(config_t *cfg, const char *val) {
+	if(!cfg) {
 		return false;
+	}
 
-	if(cfg->value)
+	if(cfg->value) {
 		free(cfg->value);
+	}
 
 	cfg->value = xstrdup(val);
 
@@ -186,8 +185,9 @@ bool set_config_string(config_t *cfg, const char* val)
 bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 	struct addrinfo *ai;
 
-	if(!cfg)
+	if(!cfg) {
 		return false;
+	}
 
 	ai = str2addrinfo(cfg->value, NULL, 0);
 
@@ -196,8 +196,8 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 		return true;
 	}
 
-	logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in %s line %d",
-		   cfg->variable, cfg->file, cfg->line);
+	logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in line %d",
+	       cfg->variable, cfg->line);
 
 	return false;
 }
@@ -205,27 +205,32 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 /*
   Read exactly one line and strip the trailing newline if any.
 */
-static char *readline(FILE * fp, char *buf, size_t buflen) {
+static char *readline(FILE *fp, char *buf, size_t buflen) {
 	char *newline = NULL;
 	char *p;
 
-	if(feof(fp))
+	if(feof(fp)) {
 		return NULL;
+	}
 
 	p = fgets(buf, buflen, fp);
 
-	if(!p)
+	if(!p) {
 		return NULL;
+	}
 
 	newline = strchr(p, '\n');
 
-	if(!newline)
+	if(!newline) {
 		return buf;
+	}
 
 	/* kill newline and carriage return if necessary */
 	*newline = '\0';
-	if(newline > p && newline[-1] == '\r')
+
+	if(newline > p && newline[-1] == '\r') {
 		newline[-1] = '\0';
+	}
 
 	return buf;
 }
@@ -237,29 +242,32 @@ config_t *parse_config_line(char *line, const char *fname, int lineno) {
 	variable = value = line;
 
 	eol = line + strlen(line);
-	while(strchr("\t ", *--eol))
+
+	while(strchr("\t ", *--eol)) {
 		*eol = '\0';
+	}
 
 	len = strcspn(value, "\t =");
 	value += len;
 	value += strspn(value, "\t ");
+
 	if(*value == '=') {
 		value++;
 		value += strspn(value, "\t ");
 	}
+
 	variable[len] = '\0';
 
 	if(!*value) {
 		const char err[] = "No value for variable";
 		logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s",
-			err, variable, lineno, fname);
+		       err, variable, lineno, fname);
 		return NULL;
 	}
 
 	cfg = new_config();
 	cfg->variable = xstrdup(variable);
 	cfg->value = xstrdup(value);
-	cfg->file = xstrdup(fname);
 	cfg->line = lineno;
 
 	return cfg;
@@ -286,22 +294,27 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 	}
 
 	for(;;) {
-		line = readline(fp, buffer, sizeof buffer);
+		line = readline(fp, buffer, sizeof(buffer));
 
 		if(!line) {
-			if(feof(fp))
+			if(feof(fp)) {
 				result = true;
+			}
+
 			break;
 		}
 
 		lineno++;
 
-		if(!*line || *line == '#')
+		if(!*line || *line == '#') {
 			continue;
+		}
 
 		if(ignore) {
-			if(!strncmp(line, "-----END", 8))
+			if(!strncmp(line, "-----END", 8)) {
 				ignore = false;
+			}
+
 			continue;
 		}
 
@@ -311,8 +324,11 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 		}
 
 		cfg = parse_config_line(line, fname, lineno);
-		if (!cfg)
+
+		if(!cfg) {
 			break;
+		}
+
 		config_add(config_tree, cfg);
 	}
 
@@ -321,8 +337,7 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 	return result;
 }
 
-bool write_config_file(const struct splay_tree_t *config_tree, const char *fname)
-{
+bool write_config_file(const struct splay_tree_t *config_tree, const char *fname) {
 	FILE *fp;
 
 	fp = fopen(fname, "w+");
@@ -332,19 +347,22 @@ bool write_config_file(const struct splay_tree_t *config_tree, const char *fname
 		return false;
 	}
 
-	for splay_each(config_t, cnf, config_tree)
-	{
-		if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable))
+	for splay_each(config_t, cnf, config_tree) {
+		if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable)) {
 			goto error;
+		}
 
-		if(fwrite(" = ", sizeof(char), 3, fp) < 3)
+		if(fwrite(" = ", sizeof(char), 3, fp) < 3) {
 			goto error;
+		}
 
-		if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value))
+		if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) {
 			goto error;
+		}
 
-		if(fwrite("\n", sizeof(char), 1, fp) < 1)
+		if(fwrite("\n", sizeof(char), 1, fp) < 1) {
 			goto error;
+		}
 	}
 
 	fclose(fp);
@@ -360,12 +378,13 @@ bool read_server_config(meshlink_handle_t *mesh) {
 	char filename[PATH_MAX];
 	bool x;
 
-	snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
+	snprintf(filename, PATH_MAX, "%s" SLASH "meshlink.conf", mesh->confbase);
 	errno = 0;
 	x = read_config_file(mesh->config, filename);
 
-	if(!x && errno)
+	if(!x && errno) {
 		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
+	}
 
 	return x;
 }
@@ -374,29 +393,35 @@ bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const
 	char filename[PATH_MAX];
 	bool x;
 
-	snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
 	x = read_config_file(config_tree, filename);
 
 	return x;
 }
 
-bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *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);
+	snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
 	return write_config_file(config_tree, filename);
 }
 
-bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, bool replace) {
-	assert(mesh && name && key && (replace || value));
+bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, int trim) {
+	assert(mesh && name && key);
 
 	char filename[PATH_MAX];
 	char tmpname[PATH_MAX];
 	bool error = false;
 
-	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
-	snprintf(tmpname, sizeof tmpname, "%s.tmp", filename);
+	if(snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name) >= PATH_MAX) {
+		logger(mesh, MESHLINK_ERROR, "Filename too long: %s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+		return false;
+	}
+
+	if(snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename) >= PATH_MAX) {
+		logger(mesh, MESHLINK_ERROR, "Filename too long: %s.tmp", filename);
+		return false;
+	}
 
 	FILE *fr = fopen(filename, "r");
 
@@ -415,37 +440,42 @@ bool modify_config_file(struct meshlink_handle *mesh, const char *name, const ch
 
 	char buf[4096];
 	char *sep;
-	bool found = false;
+	int found = 0;
+
+	if(value) {
+		fprintf(fw, "%s = %s\n", key, value);
+		found++;
+	}
 
-	while(readline(fr, buf, sizeof buf)) {
-		if(!*buf || *buf == '#')
+	while(readline(fr, buf, sizeof(buf))) {
+		if(!*buf || *buf == '#') {
 			goto copy;
+		}
 
 		sep = strchr(buf, ' ');
-		if(!sep)
+
+		if(!sep) {
 			goto copy;
+		}
 
 		*sep = 0;
+
 		if(strcmp(buf, key)) {
 			*sep = ' ';
 			goto copy;
 		}
 
-		if(!value) {
-			found = true;
+		// We found the key and the value. We already added it at the top, so ignore this one.
+		if(value && sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value)) {
 			continue;
 		}
 
-		// We found the key and the value. Keep one copy around.
-		if(sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value)) {
-			if(found)
-				continue;
-			found = true;
-		}
-
 		// We found the key but with a different value, delete it if wanted.
-		if(!found && replace)
+		found++;
+
+		if((!value || trim) && found > trim) {
 			continue;
+		}
 
 		*sep = ' ';
 
@@ -453,22 +483,21 @@ copy:
 		fprintf(fw, "%s\n", buf);
 	}
 
-	if(ferror(fr))
+	if(ferror(fr)) {
 		error = true;
+	}
 
 	fclose(fr);
 
-	// Add new key/value pair if necessary
-	if(!found && value)
-		fprintf(fw, "%s = %s\n", key, value);
-
-	if(ferror(fw))
+	if(ferror(fw)) {
 		error = true;
+	}
 
-	if(fclose(fw))
+	if(fclose(fw)) {
 		error = true;
+	}
 
-	// If any error occured during reading or writing, exit.
+	// If any error occurred during reading or writing, exit.
 	if(error) {
 		unlink(tmpname);
 		return false;
@@ -477,10 +506,12 @@ copy:
 	// Try to atomically replace the old config file with the new one.
 #ifdef HAVE_MINGW
 	char bakname[PATH_MAX];
-	snprintf(bakname, sizeof bakname, "%s.bak", filename);
+	snprintf(bakname, sizeof(bakname), "%s.bak", filename);
+
 	if(rename(filename, bakname) || rename(tmpname, filename)) {
 		rename(bakname, filename);
 #else
+
 	if(rename(tmpname, filename)) {
 #endif
 		return false;
@@ -493,5 +524,5 @@ copy:
 }
 
 bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
-	return modify_config_file(mesh, name, key, value, false);
+	return modify_config_file(mesh, name, key, value, 0);
 }