#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;
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;
}
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(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(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);
+ fprintf(fp, "%s = %s\n", key, value);
fclose(fp);
}
- free(fname);
-
return fp != NULL;
}