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.12 2000/10/11 22:00:57 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>
#include <utils.h> /* for cp */
#include "config.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 *configfilename = NULL;
+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;
*/
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 },
- { "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:
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;
+ }
}
/*
return err;
}
-/*
- Look up the value of the config option type
-*/
-const config_t *get_config_val(config_t *p, which_t type)
+int read_server_config()
{
+ char *fname;
+ int x;
cp
- for(p = config; p != NULL; p = p->next)
- if(p->which == type)
- return p;
+ 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
- /* Not found */
- return NULL;
+ return x;
}
/*
- Support for multiple config lines.
- Index is used to get a specific value, 0 being the first, 1 the second etc.
+ Look up the value of the config option type
*/
-const config_t *get_next_config_val(config_t *p, which_t type, int index)
+const config_t *get_config_val(config_t *p, which_t type)
{
-cp
- for(p = config; p != NULL; p = p->next)
+cp
+ for(; p != NULL; p = p->next)
if(p->which == type)
- if(--index < 0)
- return p;
-cp
- /* Not found */
- return NULL;
+ break;
+cp
+ return p;
}
/*