X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=46fd81d57d3897cbcb1f341e00afa8a7cb8aa402;hb=f5bb64b36ae0807cdd3f241f81a8e933065437f6;hp=b9bfbf67ace863bc09d09d05f64ec6c2aa36bd14;hpb=a9eba276a4ccec1c67611e8496ac0a30137b7493;p=meshlink diff --git a/src/conf.c b/src/conf.c index b9bfbf67..46fd81d5 100644 --- a/src/conf.c +++ b/src/conf.c @@ -28,6 +28,7 @@ #include "conf.h" #include "list.h" #include "logger.h" +#include "names.h" #include "netutl.h" /* for str2address */ #include "protocol.h" #include "utils.h" /* for cp */ @@ -37,11 +38,8 @@ splay_tree_t *config_tree; int pinginterval = 0; /* seconds between pings */ int pingtimeout = 0; /* seconds to wait for response */ -char *confbase = NULL; /* directory in which all config files are */ -char *netname = NULL; /* name of the vpn network */ list_t *cmdline_conf = NULL; /* global/host configuration values given at the command line */ - static int config_compare(const config_t *a, const config_t *b) { int result;