/*
conf.c -- configuration code
Copyright (C) 1998 Emphyrio,
- Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
+ 2000 Guus Sliepen <guus@sliepen.warande.net>
+ 2000 Cris van Pelt <tribbel@arise.dhs.org>
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
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.3 2000/06/27 20:10:47 guus Exp $
*/
-/* Created more dynamic storage for lines read from the config file. --
- Cris van Pelt */
#include "config.h"
#include "conf.h"
#include "netutl.h" /* for strtoip */
+#include "system.h"
+
config_t *config;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
{ "TapDevice", tapdevice, TYPE_NAME },
{ "KeyExpire", keyexpire, TYPE_INT },
{ "VpnMask", vpnmask, TYPE_IP },
+ { "Hostnames", resolve_dns, TYPE_BOOL },
+ { "IndirectData", indirectdata, TYPE_BOOL },
{ NULL, 0, 0 }
};
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(*p));
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;
}
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;
}
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;
}
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, sys_errlist[errno]);
return 1;
}
/* 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;
+
+ for(p = config; p != NULL; p = p->next)
+ if(p->which == type)
+ if(--index < 0)
+ return p;
+
+ /* Not found */
+ return NULL;
+}