X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=1b729b2c15d10ff868e3835be56f05825cff073c;hp=bea38957c189493be40e86ec75ef164359f4e462;hb=296171d115614d61480d896cd77898f5393c191d;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7 diff --git a/src/conf.c b/src/conf.c index bea38957..1b729b2c 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,7 +1,9 @@ /* conf.c -- configuration code Copyright (C) 1998 Emphyrio, - Copyright (C) 1998,99 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,10 +18,10 @@ 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.10 2000/09/14 14:34:38 zarq Exp $ */ -/* foute config read code, GPL, emphyrio 1998 */ -/* Mutilated by me -- Ivo */ #include "config.h" @@ -34,10 +36,17 @@ #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; + +/* Will be set if HUP signal is received. It will be processed when it is safe. */ +int sighup = 0; typedef struct internal_config_t { char *name; @@ -49,8 +58,8 @@ typedef struct internal_config_t { These are all the possible configurable values */ static internal_config_t hazahaza[] = { - { "AllowConnect", allowconnect, TYPE_BOOL }, - { "ConnectTo", upstreamip, TYPE_IP }, + { "AllowConnect", allowconnect, TYPE_BOOL }, /* Is not used anywhere. Remove? */ + { "ConnectTo", upstreamip, TYPE_NAME }, { "ConnectPort", upstreamport, TYPE_INT }, { "ListenPort", listenport, TYPE_INT }, { "MyOwnVPNIP", myvpnip, TYPE_IP }, @@ -59,6 +68,13 @@ static internal_config_t hazahaza[] = { { "PingTimeout", pingtimeout, TYPE_INT }, { "TapDevice", tapdevice, TYPE_NAME }, { "KeyExpire", keyexpire, TYPE_INT }, + { "VpnMask", vpnmask, TYPE_IP }, + { "Hostnames", resolve_dns, TYPE_BOOL }, + { "IndirectData", indirectdata, TYPE_BOOL }, + { "TCPonly", tcponly, TYPE_BOOL }, + { "Interface", interface, TYPE_NAME }, + { "InterfaceIP", interfaceip, TYPE_IP }, + { "Name", tincname, TYPE_NAME }, { NULL, 0, 0 } }; @@ -68,10 +84,10 @@ 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; - - p = (config_t*)xmalloc(sizeof(config_t)); +cp + p = (config_t*)xmalloc(sizeof(*p)); p->data.val = 0; switch(argtype) @@ -97,14 +113,25 @@ 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; } @@ -114,15 +141,27 @@ add_config_val(config_t **cfg, int argtype, char *val) int readconfig(const char *fname, FILE *fp) { - char line[81]; + char *line, *temp_buf; char *p, *q; int i, lineno = 0; config_t *cfg; - +cp + line = (char *)xmalloc(80 * sizeof(char)); + temp_buf = (char *)xmalloc(80 * sizeof(char)); + for(;;) { if(fgets(line, 80, fp) == NULL) return 0; + + while(!index(line, '\n')) + { + fgets(temp_buf, (strlen(line)+1) * 80, fp); + if(!temp_buf) + break; + strcat(line, temp_buf); + line = (char *)xrealloc(line, (strlen(line)+1) * sizeof(char)); + } lineno++; if((p = strtok(line, "\t\n\r =")) == NULL) @@ -137,14 +176,14 @@ readconfig(const char *fname, FILE *fp) if(!hazahaza[i].name) { - fprintf(stderr, "%s: %d: Invalid variable name `%s'.\n", + fprintf(stderr, _("%s: %d: Invalid variable name `%s'.\n"), fname, lineno, p); return -1; } if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#') { - fprintf(stderr, "%s: %d: No value given for `%s'.\n", + fprintf(stderr, _("%s: %d: No value given for `%s'.\n"), fname, lineno, hazahaza[i].name); return -1; } @@ -152,7 +191,7 @@ readconfig(const char *fname, FILE *fp) cfg = add_config_val(&config, hazahaza[i].argtype, q); if(cfg == NULL) { - fprintf(stderr, "%s: %d: Invalid value `%s' for variable `%s'.\n", + fprintf(stderr, _("%s: %d: Invalid value `%s' for variable `%s'.\n"), fname, lineno, q, hazahaza[i].name); return -1; } @@ -161,6 +200,8 @@ readconfig(const char *fname, FILE *fp) if(!config) config = cfg; } +cp + return 0; } /* @@ -169,20 +210,19 @@ readconfig(const char *fname, FILE *fp) int read_config_file(const char *fname) { + int err; FILE *fp; - +cp if((fp = fopen (fname, "r")) == NULL) { - fprintf(stderr, "Could not open %s: %s\n", fname, sys_errlist[errno]); + fprintf(stderr, _("Could not open %s: %s\n"), fname, strerror(errno)); return 1; } - if(readconfig(fname, fp)) - return -1; - + err = readconfig(fname, fp); fclose (fp); - - return 0; +cp + return err; } /* @@ -192,12 +232,49 @@ const config_t * get_config_val(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(which_t type, int index) +{ + config_t *p; +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 *p, *next; +cp + for(p = config; p != NULL; p = next) + { + next = p->next; + if(p->data.ptr && (p->argtype == TYPE_NAME)) + { + free(p->data.ptr); + } + free(p); + } + config = NULL; +cp +}