#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 */
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) {
+void exit_configuration(splay_tree_t **config_tree) {
splay_delete_tree(*config_tree);
*config_tree = NULL;
}
char *fname;
bool x;
- xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
+ xasprintf(&fname, "%s" SLASH "tinc.conf", mesh->confbase);
errno = 0;
- x = read_config_file(config_tree, fname);
+ x = read_config_file(mesh->config, fname);
if(!x && errno)
logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
char *fname;
bool x;
- xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
x = read_config_file(config_tree, fname);
free(fname);
bool append_config_file(const char *name, const char *key, const char *value) {
char *fname;
- xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
FILE *fp = fopen(fname, "a");