Fix a crash when meshlink_open() is called with an invalid confbase.

[meshlink] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index a1c0a3df600f80ecbaee2df8807b98396583495f..5231a9dfca25fc16c1a8fd3fbf63b9c0a8001081 100644 (file)
--- 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;
 
@@ -54,7 +51,8 @@ void init_configuration(splay_tree_t **config_tree) {
 }
 
 void exit_configuration(splay_tree_t **config_tree) {
-       splay_delete_tree(*config_tree);
+       if(*config_tree)
+               splay_delete_tree(*config_tree);
        *config_tree = NULL;
 }
 
@@ -293,47 +291,42 @@ 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", mesh->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", mesh->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", mesh->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);
+               fprintf(fp, "%s = %s\n", key, value);
                fclose(fp);
        }
 
-       free(fname);
-
        return fp != NULL;
 }