/*
conf.c -- configuration code
- Copyright (C) 1998 Robert van der Meulen
+ Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
- 2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+ 2000 Cris van Pelt
2010-2011 Julien Muchembled <jm@jmuchemb.eu>
- 2000 Cris van Pelt
+ 2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+ 2013 Florent Clairambault <florent@clairambault.fr>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
}
config_t *new_config(void) {
- return xmalloc_and_zero(sizeof(config_t));
+ return xzalloc(sizeof(config_t));
}
void free_config(config_t *cfg) {
return false;
}
-bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
- subnet_t subnet = {NULL};
-
- if(!cfg)
- return false;
-
- if(!str2net(&subnet, cfg->value)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Subnet expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
- return false;
- }
-
- /* Teach newbies what subnets are... */
-
- if(((subnet.type == SUBNET_IPV4)
- && !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof subnet.net.ipv4.address))
- || ((subnet.type == SUBNET_IPV6)
- && !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof subnet.net.ipv6.address))) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Network address and prefix length do not match for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
- return false;
- }
-
- *(*result = new_subnet()) = subnet;
-
- return true;
-}
-
/*
Read exactly one line and strip the trailing newline if any.
*/
char *fname;
bool x;
- read_config_options(config_tree, NULL);
+ //read_config_options(config_tree, NULL);
xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
+ errno = 0;
x = read_config_file(config_tree, fname);
- if(!x)
+ // We will try to read the conf files in the "conf.d" dir
+ if (x) {
+ char * dname;
+ xasprintf(&dname, "%s" SLASH "conf.d", confbase);
+ DIR *dir = opendir (dname);
+ // If we can find this dir
+ if (dir) {
+ struct dirent *ep;
+ // We list all the files in it
+ while (x && (ep = readdir (dir))) {
+ size_t l = strlen(ep->d_name);
+ // And we try to read the ones that end with ".conf"
+ if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
+ free(fname);
+ xasprintf(&fname, "%s" SLASH "%s", dname, ep->d_name);
+ x = read_config_file(config_tree, fname);
+ }
+ }
+ closedir (dir);
+ }
+ free(dname);
+ }
+
+ if(!x && errno)
logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
free(fname);
char *fname;
bool x;
- read_config_options(config_tree, name);
+ //read_config_options(config_tree, name);
xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
x = read_config_file(config_tree, fname);