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.13 2000/10/14 17:04:12 guus Exp $
+ $Id: conf.c,v 1.9.4.19 2000/10/29 00:24:31 guus Exp $
*/
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
+#include <stdio.h>
#include <xalloc.h>
#include "connlist.h"
#include "system.h"
-config_t *config;
+config_t *config = NULL;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
char *confbase = NULL; /* directory in which all config files are */
+char *netname = NULL; /* name of the vpn network */
/* Will be set if HUP signal is received. It will be processed when it is safe. */
int sighup = 0;
{ "Address", address, TYPE_NAME },
{ "Port", port, TYPE_INT },
{ "PublicKey", publickey, TYPE_NAME },
- { "Subnet", subnet, TYPE_NAME },
+ { "Subnet", subnet, TYPE_IP }, /* Use IPv4 subnets only for now */
{ "RestrictHosts", restricthosts, TYPE_BOOL },
{ "RestrictSubnets", restrictsubnets, TYPE_BOOL },
{ "RestrictAddress", restrictaddress, TYPE_BOOL },
config_t *
add_config_val(config_t **cfg, int argtype, char *val)
{
- config_t *p, *r;
+ config_t *p;
char *q;
cp
p = (config_t*)xmalloc(sizeof(*p));
p->data.val = 0;
-
+
switch(argtype)
{
case TYPE_INT:
if(p->data.val)
{
- if(*cfg)
- {
- r = *cfg;
- while(r->next)
- r = r->next;
- r->next = p;
- }
- else
- *cfg = p;
- p->next = NULL;
+ p->next = *cfg;
+ *cfg = p;
+cp
return p;
}
-
- free(p);
+ else
+ {
+ free(p);
cp
- return NULL;
+ return NULL;
+ }
}
/*
char *fname;
int x;
cp
- asprintf(fname, "%s/tinc.conf", confbase);
+ asprintf(&fname, "%s/tinc.conf", confbase);
x = read_config_file(&config, fname);
+ if(x != 0)
+ {
+ fprintf(stderr, _("Failed to read `%s': %m\n"),
+ fname);
+ }
free(fname);
cp
return x;
const config_t *get_config_val(config_t *p, which_t type)
{
cp
- for(p = config; p != NULL; p = p->next)
+ for(; p != NULL; p = p->next)
if(p->which == type)
- return p;
+ break;
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;
+ return p;
}
/*