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.21 2000/11/04 22:57:30 guus Exp $
*/
+#include "config.h"
#include <ctype.h>
#include <errno.h>
*/
static internal_config_t hazahaza[] = {
/* Main configuration file keywords */
- { "Name", tincname, TYPE_NAME },
- { "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 },
- { "Interface", interface, TYPE_NAME },
- { "InterfaceIP", interfaceip, TYPE_IP },
+ { "Name", config_name, TYPE_NAME },
+ { "ConnectTo", config_connectto, TYPE_NAME },
+ { "PingTimeout", config_pingtimeout, TYPE_INT },
+ { "TapDevice", config_tapdevice, TYPE_NAME },
+ { "PrivateKey", config_privatekey, TYPE_NAME },
+ { "KeyExpire", config_keyexpire, TYPE_INT },
+ { "Hostnames", config_hostnames, TYPE_BOOL },
+ { "Interface", config_interface, TYPE_NAME },
+ { "InterfaceIP", config_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 },
+ { "Address", config_address, TYPE_NAME },
+ { "Port", config_port, TYPE_INT },
+ { "PublicKey", config_publickey, TYPE_NAME },
+ { "Subnet", config_subnet, TYPE_IP }, /* Use IPv4 subnets only for now */
+ { "RestrictHosts", config_restricthosts, TYPE_BOOL },
+ { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
+ { "RestrictAddress", config_restrictaddress, TYPE_BOOL },
+ { "RestrictPort", config_restrictport, TYPE_BOOL },
+ { "IndirectData", config_indirectdata, TYPE_BOOL },
+ { "TCPonly", config_tcponly, TYPE_BOOL },
{ NULL, 0, 0 }
};
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.
*/