X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=640ec1357d69bd89e171560bf8c317fe188a137a;hp=146a582c9885e7c3856100d6c9c9a71af55d41ce;hb=6e39481d8f2406e60b5e329ace08b5a005d5cc43;hpb=ee96ccabbbf0180d5631d3c22838456f28ee9c15 diff --git a/src/conf.c b/src/conf.c index 146a582c..640ec135 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,7 +1,9 @@ /* conf.c -- configuration code Copyright (C) 1998 Emphyrio, - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans + 2000 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 @@ -16,8 +18,11 @@ 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: conf.c,v 1.9.4.11 2000/10/11 13:42:52 guus Exp $ */ + #include "config.h" #include @@ -31,31 +36,43 @@ #include "conf.h" #include "netutl.h" /* for strtoip */ +#include /* for cp */ + +#include "system.h" config_t *config; int debug_lvl = 0; int timeout = 0; /* seconds before timeout */ +char *configfilename = NULL; -typedef struct internal_config_t { - char *name; - enum which_t which; - int argtype; -} internal_config_t; +/* Will be set if HUP signal is received. It will be processed when it is safe. */ +int sighup = 0; /* These are all the possible configurable values */ static internal_config_t hazahaza[] = { - { "AllowConnect", allowconnect, TYPE_BOOL }, /* Is not used anywhere. Remove? */ - { "ConnectTo", upstreamip, TYPE_IP }, - { "ConnectPort", upstreamport, TYPE_INT }, - { "ListenPort", listenport, TYPE_INT }, - { "MyOwnVPNIP", myvpnip, TYPE_IP }, - { "MyVirtualIP", myvpnip, TYPE_IP }, /* an alias */ - { "Passphrases", passphrasesdir, TYPE_NAME }, +/* Main configuration file keywords */ + { "Name", tincname, TYPE_NAME }, + { "ConnectTo", connectto, TYPE_NAME }, { "PingTimeout", pingtimeout, TYPE_INT }, { "TapDevice", tapdevice, TYPE_NAME }, + { "PrivateKey", privatekey, TYPE_NAME }, { "KeyExpire", keyexpire, TYPE_INT }, + { "Hostnames", resolve_dns, TYPE_BOOL }, + { "Interface", interface, TYPE_NAME }, + { "InterfaceIP", interfaceip, TYPE_IP }, +/* Host configuration file keywords */ + { "Address", address, TYPE_NAME }, + { "Port", port, TYPE_INT }, + { "PublicKey", publickey, TYPE_NAME }, + { "Subnet", subnet, TYPE_NAME }, + { "RestrictHosts", restricthosts, TYPE_BOOL }, + { "RestrictSubnets", restrictsubnets, TYPE_BOOL }, + { "RestrictAddress", restrictaddress, TYPE_BOOL }, + { "RestrictPort", restrictport, TYPE_BOOL }, + { "IndirectData", indirectdata, TYPE_BOOL }, + { "TCPonly", tcponly, TYPE_BOOL }, { NULL, 0, 0 } }; @@ -65,9 +82,9 @@ static internal_config_t hazahaza[] = { config_t * add_config_val(config_t **cfg, int argtype, char *val) { - config_t *p; + config_t *p, *r; char *q; - +cp p = (config_t*)xmalloc(sizeof(*p)); p->data.val = 0; @@ -94,34 +111,62 @@ add_config_val(config_t **cfg, int argtype, char *val) p->data.val = 0; } + p->argtype = argtype; + if(p->data.val) { - p->next = *cfg; - *cfg = p; + if(*cfg) + { + r = *cfg; + while(r->next) + r = r->next; + r->next = p; + } + else + *cfg = p; + p->next = NULL; return p; } free(p); +cp return NULL; } /* - Get variable from a section in a configfile. returns -1 on failure. + Parse a configuration file and put the results in the configuration tree + starting at *base. */ -int -readconfig(const char *fname, FILE *fp) +int read_config_file(config_t **base, const char *fname) { - char line[81]; + int err; + FILE *fp; + char line[MAXBUFSIZE]; /* There really should not be any line longer than this... */ char *p, *q; - int i, lineno = 0; + int i, err = -1, lineno = 0; config_t *cfg; +cp + if((fp = fopen (fname, "r")) == NULL) + { + return -1; + } for(;;) { - if(fgets(line, 80, fp) == NULL) - return 0; + if(fgets(line, MAXBUFSIZE, fp) == NULL) + { + err = 0; + break; + } + lineno++; + if(!index(line, '\n')) + { + syslog(LOG_ERR, _("Line %d too long while reading config file %s"), lineno, fname); + break; + } + if((p = strtok(line, "\t\n\r =")) == NULL) continue; /* no tokens on this line */ @@ -134,66 +179,82 @@ readconfig(const char *fname, FILE *fp) if(!hazahaza[i].name) { - fprintf(stderr, "%s: %d: Invalid variable name `%s'.\n", - fname, lineno, p); - return -1; + syslog(LOG_ERR, _("Invalid variable name on line %d while reading config file %s"), + lineno, fname); + break; } if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#') { - fprintf(stderr, "%s: %d: No value given for `%s'.\n", - fname, lineno, hazahaza[i].name); - return -1; + fprintf(stderr, _("No value for variable on line %d while reading config file %s"), + lineno, fname); + break; } - cfg = add_config_val(&config, hazahaza[i].argtype, q); + cfg = add_config_val(base, hazahaza[i].argtype, q); if(cfg == NULL) { - fprintf(stderr, "%s: %d: Invalid value `%s' for variable `%s'.\n", - fname, lineno, q, hazahaza[i].name); - return -1; + fprintf(stderr, _("Invalid value for variable on line %d while reading config file %s"), + lineno, fname); + break; } cfg->which = hazahaza[i].which; if(!config) config = cfg; } -} - -/* - wrapper function for readconfig -*/ -int -read_config_file(const char *fname) -{ - FILE *fp; - - if((fp = fopen (fname, "r")) == NULL) - { - fprintf(stderr, "Could not open %s: %s\n", fname, sys_errlist[errno]); - return 1; - } - - if(readconfig(fname, fp)) - return -1; fclose (fp); - - return 0; +cp + return err; } /* Look up the value of the config option type */ -const config_t * -get_config_val(which_t type) +const config_t *get_config_val(config_t *p, which_t type) { - config_t *p; - +cp for(p = config; p != NULL; p = p->next) if(p->which == type) return p; +cp + /* Not found */ + return NULL; +} +/* + Support for multiple config lines. + Index is used to get a specific value, 0 being the first, 1 the second etc. +*/ +const config_t *get_next_config_val(config_t *p, which_t type, int index) +{ +cp + for(p = config; p != NULL; p = p->next) + if(p->which == type) + if(--index < 0) + return p; +cp /* Not found */ return NULL; } + +/* + Remove the complete configuration tree. +*/ +void clear_config(config_t **base) +{ + config_t *p, *next; +cp + for(p = *base; p != NULL; p = next) + { + next = p->next; + if(p->data.ptr && (p->argtype == TYPE_NAME)) + { + free(p->data.ptr); + } + free(p); + } + *base = NULL; +cp +}