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.14 2000/10/15 00:59:34 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>
{ "ConnectTo", connectto, TYPE_NAME },
{ "PingTimeout", pingtimeout, TYPE_INT },
{ "TapDevice", tapdevice, TYPE_NAME },
- { "TapSubnet", tapsubnet, TYPE_IP },
{ "PrivateKey", privatekey, TYPE_NAME },
{ "KeyExpire", keyexpire, TYPE_INT },
{ "Hostnames", resolve_dns, TYPE_BOOL },
{ "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:
cp
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)
break;
cp
return p;
}
-/*
- 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)
- break;
-cp
- return p;
-}
-
/*
Remove the complete configuration tree.
*/