X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fconf.c;h=ea33e9c38a4c91588aed75a9a7b91587e01d986d;hp=d567cd2f0cd12c6c8b9c0ba321297ed9b24470bd;hb=4766359e1426bdf1383c898d6103d8760e5e296d;hpb=228e7a5c8f0e517dcede50f886965a44fca39853 diff --git a/src/conf.c b/src/conf.c index d567cd2..ea33e9c 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,9 +1,9 @@ /* conf.c -- configuration code Copyright (C) 1998 Robert van der Meulen - 1998-2005 Ivo Timmermans - 2000-2005 Guus Sliepen - 2000 Cris van Pelt + 1998-2005 Ivo Timmermans + 2000-2009 Guus Sliepen + 2000 Cris van Pelt 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 @@ -15,11 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" @@ -28,6 +26,7 @@ #include "conf.h" #include "logger.h" #include "netutl.h" /* for str2address */ +#include "protocol.h" #include "utils.h" /* for cp */ #include "xalloc.h" @@ -38,8 +37,7 @@ 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 */ -static int config_compare(const config_t *a, const config_t *b) -{ +static int config_compare(const config_t *a, const config_t *b) { int result; result = strcasecmp(a->variable, b->variable); @@ -55,32 +53,20 @@ static int config_compare(const config_t *a, const config_t *b) return strcmp(a->file, b->file); } -void init_configuration(avl_tree_t ** config_tree) -{ - cp(); - +void init_configuration(avl_tree_t ** config_tree) { *config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config); } -void exit_configuration(avl_tree_t ** config_tree) -{ - cp(); - +void exit_configuration(avl_tree_t ** config_tree) { avl_delete_tree(*config_tree); *config_tree = NULL; } -config_t *new_config(void) -{ - cp(); - +config_t *new_config(void) { return xmalloc_and_zero(sizeof(config_t)); } -void free_config(config_t *cfg) -{ - cp(); - +void free_config(config_t *cfg) { if(cfg->variable) free(cfg->variable); @@ -93,19 +79,13 @@ void free_config(config_t *cfg) free(cfg); } -void config_add(avl_tree_t *config_tree, config_t *cfg) -{ - cp(); - +void config_add(avl_tree_t *config_tree, config_t *cfg) { avl_insert(config_tree, cfg); } -config_t *lookup_config(avl_tree_t *config_tree, char *variable) -{ +config_t *lookup_config(avl_tree_t *config_tree, char *variable) { config_t cfg, *found; - cp(); - cfg.variable = variable; cfg.file = ""; cfg.line = 0; @@ -121,13 +101,10 @@ config_t *lookup_config(avl_tree_t *config_tree, char *variable) return found; } -config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) -{ +config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) { avl_node_t *node; config_t *found; - cp(); - node = avl_search_node(config_tree, cfg); if(node) { @@ -142,10 +119,7 @@ config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) return NULL; } -bool get_config_bool(const config_t *cfg, bool *result) -{ - cp(); - +bool get_config_bool(const config_t *cfg, bool *result) { if(!cfg) return false; @@ -157,32 +131,26 @@ bool get_config_bool(const config_t *cfg, bool *result) return true; } - logger(LOG_ERR, _("\"yes\" or \"no\" expected for configuration variable %s in %s line %d"), + logger(LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d", cfg->variable, cfg->file, cfg->line); return false; } -bool get_config_int(const config_t *cfg, int *result) -{ - cp(); - +bool get_config_int(const config_t *cfg, int *result) { if(!cfg) return false; if(sscanf(cfg->value, "%d", result) == 1) return true; - logger(LOG_ERR, _("Integer expected for configuration variable %s in %s line %d"), + logger(LOG_ERR, "Integer expected for configuration variable %s in %s line %d", cfg->variable, cfg->file, cfg->line); return false; } -bool get_config_string(const config_t *cfg, char **result) -{ - cp(); - +bool get_config_string(const config_t *cfg, char **result) { if(!cfg) return false; @@ -191,12 +159,9 @@ bool get_config_string(const config_t *cfg, char **result) return true; } -bool get_config_address(const config_t *cfg, struct addrinfo **result) -{ +bool get_config_address(const config_t *cfg, struct addrinfo **result) { struct addrinfo *ai; - cp(); - if(!cfg) return false; @@ -207,23 +172,20 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) return true; } - logger(LOG_ERR, _("Hostname or IP address expected for configuration variable %s in %s line %d"), + logger(LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d", cfg->variable, cfg->file, cfg->line); return false; } -bool get_config_subnet(const config_t *cfg, subnet_t ** result) -{ +bool get_config_subnet(const config_t *cfg, subnet_t ** result) { subnet_t subnet = {0}; - cp(); - if(!cfg) return false; if(!str2net(&subnet, cfg->value)) { - logger(LOG_ERR, _("Subnet expected for configuration variable %s in %s line %d"), + logger(LOG_ERR, "Subnet expected for configuration variable %s in %s line %d", cfg->variable, cfg->file, cfg->line); return false; } @@ -234,7 +196,7 @@ bool get_config_subnet(const config_t *cfg, subnet_t ** result) && !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t))) || ((subnet.type == SUBNET_IPV6) && !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t)))) { - logger(LOG_ERR, _ ("Network address and prefix length do not match for configuration variable %s in %s line %d"), + logger(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; } @@ -245,113 +207,60 @@ bool get_config_subnet(const config_t *cfg, subnet_t ** result) } /* - Read exactly one line and strip the trailing newline if any. If the - file was on EOF, return NULL. Otherwise, return all the data in a - dynamically allocated buffer. - - If line is non-NULL, it will be used as an initial buffer, to avoid - unnecessary mallocing each time this function is called. If buf is - given, and buf needs to be expanded, the var pointed to by buflen - will be increased. + Read exactly one line and strip the trailing newline if any. */ -static char *readline(FILE * fp, char **buf, size_t *buflen) -{ +static char *readline(FILE * fp, char *buf, size_t buflen) { char *newline = NULL; char *p; - char *line; /* The array that contains everything that has been read so far */ - char *idx; /* Read into this pointer, which points to an offset within line */ - size_t size, newsize; /* The size of the current array pointed to by line */ - size_t maxlen; /* Maximum number of characters that may be read with fgets. This is newsize - oldsize. */ if(feof(fp)) return NULL; - if(buf && buflen) { - size = *buflen; - line = *buf; - } else { - size = 100; - line = xmalloc(size); - } - - maxlen = size; - idx = line; - *idx = 0; - - for(;;) { - errno = 0; - p = fgets(idx, maxlen, fp); + p = fgets(buf, buflen, fp); - if(!p) { /* EOF or error */ - if(feof(fp)) - break; + if(!p) + return NULL; - /* otherwise: error; let the calling function print an error message if applicable */ - free(line); - return NULL; - } + newline = strchr(p, '\n'); - newline = strchr(p, '\n'); - - if(!newline) { /* We haven't yet read everything to the end of the line */ - newsize = size << 1; - line = xrealloc(line, newsize); - idx = &line[size - 1]; - maxlen = newsize - size + 1; - size = newsize; - } else { - *newline = '\0'; /* kill newline */ - break; /* yay */ - } - } + if(!newline) + return buf; - if(buf && buflen) { - *buflen = size; - *buf = line; - } + *newline = '\0'; /* kill newline */ + if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */ + newline[-1] = '\0'; - return line; + return buf; } /* Parse a configuration file and put the results in the configuration tree starting at *base. */ -int read_config_file(avl_tree_t *config_tree, const char *fname) -{ - int err = -2; /* Parse error */ +bool read_config_file(avl_tree_t *config_tree, const char *fname) { FILE *fp; - char *buffer, *line; + char buffer[MAX_STRING_SIZE]; + char *line; char *variable, *value, *eol; int lineno = 0; int len; bool ignore = false; config_t *cfg; - size_t bufsize; - - cp(); + bool result = false; fp = fopen(fname, "r"); if(!fp) { - logger(LOG_ERR, _("Cannot open config file %s: %s"), fname, - strerror(errno)); - return -3; + logger(LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno)); + return false; } - bufsize = 100; - buffer = xmalloc(bufsize); - for(;;) { - line = readline(fp, &buffer, &bufsize); + line = readline(fp, buffer, sizeof buffer); if(!line) { - err = -1; - break; - } - - if(feof(fp)) { - err = 0; + if(feof(fp)) + result = true; break; } @@ -388,7 +297,7 @@ int read_config_file(avl_tree_t *config_tree, const char *fname) if(!*value) { - logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"), + logger(LOG_ERR, "No value for variable `%s' on line %d while reading config file %s", variable, lineno, fname); break; } @@ -402,60 +311,56 @@ int read_config_file(avl_tree_t *config_tree, const char *fname) config_add(config_tree, cfg); } - free(buffer); fclose(fp); - return err; + return result; } -bool read_server_config() -{ +bool read_server_config() { char *fname; - int x; - - cp(); + bool x; - asprintf(&fname, "%s/tinc.conf", confbase); + xasprintf(&fname, "%s/tinc.conf", confbase); x = read_config_file(config_tree, fname); - if(x == -1) { /* System error: complain */ - logger(LOG_ERR, _("Failed to read `%s': %s"), fname, strerror(errno)); + if(!x) { /* System error: complain */ + logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno)); } free(fname); - return x == 0; + return x; } -FILE *ask_and_open(const char *filename, const char *what, const char *mode) -{ +FILE *ask_and_open(const char *filename, const char *what) { FILE *r; char *directory; - char *fn; + char line[PATH_MAX]; + const char *fn; /* Check stdin and stdout */ if(!isatty(0) || !isatty(1)) { /* Argh, they are running us from a script or something. Write the files to the current directory and let them burn in hell for ever. */ - fn = xstrdup(filename); + fn = filename; } else { /* Ask for a file and/or directory name. */ - fprintf(stdout, _("Please enter a file to save %s to [%s]: "), + fprintf(stdout, "Please enter a file to save %s to [%s]: ", what, filename); fflush(stdout); - fn = readline(stdin, NULL, NULL); + fn = readline(stdin, line, sizeof line); if(!fn) { - fprintf(stderr, _("Error while reading stdin: %s\n"), + fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno)); return NULL; } if(!strlen(fn)) /* User just pressed enter. */ - fn = xstrdup(filename); + fn = filename; } #ifdef HAVE_MINGW @@ -467,8 +372,7 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) char *p; directory = get_current_dir_name(); - asprintf(&p, "%s/%s", directory, fn); - free(fn); + xasprintf(&p, "%s/%s", directory, fn); free(directory); fn = p; } @@ -477,16 +381,44 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) /* Open it first to keep the inode busy */ - r = fopen(fn, mode); + r = fopen(fn, "r+") ?: fopen(fn, "w+"); if(!r) { - fprintf(stderr, _("Error opening file `%s': %s\n"), + fprintf(stderr, "Error opening file `%s': %s\n", fn, strerror(errno)); - free(fn); return NULL; } - free(fn); - return r; } + +bool disable_old_keys(FILE *f) { + char buf[100]; + long pos; + bool disabled = false; + + rewind(f); + pos = ftell(f); + + while(fgets(buf, sizeof buf, f)) { + if(!strncmp(buf, "-----BEGIN RSA", 14)) { + buf[11] = 'O'; + buf[12] = 'L'; + buf[13] = 'D'; + fseek(f, pos, SEEK_SET); + fputs(buf, f); + disabled = true; + } + else if(!strncmp(buf, "-----END RSA", 12)) { + buf[ 9] = 'O'; + buf[10] = 'L'; + buf[11] = 'D'; + fseek(f, pos, SEEK_SET); + fputs(buf, f); + disabled = true; + } + pos = ftell(f); + } + + return disabled; +}