- Generalized config file parsing to support multiple configuration trees.
This commit is contained in:
parent
451e9e3e7a
commit
6e39481d8f
3 changed files with 78 additions and 88 deletions
122
src/conf.c
122
src/conf.c
|
@ -19,7 +19,7 @@
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
$Id: conf.c,v 1.9.4.10 2000/09/14 14:34:38 zarq Exp $
|
$Id: conf.c,v 1.9.4.11 2000/10/11 13:42:52 guus Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
@ -48,33 +48,31 @@ char *configfilename = NULL;
|
||||||
/* Will be set if HUP signal is received. It will be processed when it is safe. */
|
/* Will be set if HUP signal is received. It will be processed when it is safe. */
|
||||||
int sighup = 0;
|
int sighup = 0;
|
||||||
|
|
||||||
typedef struct internal_config_t {
|
|
||||||
char *name;
|
|
||||||
enum which_t which;
|
|
||||||
int argtype;
|
|
||||||
} internal_config_t;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
These are all the possible configurable values
|
These are all the possible configurable values
|
||||||
*/
|
*/
|
||||||
static internal_config_t hazahaza[] = {
|
static internal_config_t hazahaza[] = {
|
||||||
{ "AllowConnect", allowconnect, TYPE_BOOL }, /* Is not used anywhere. Remove? */
|
/* Main configuration file keywords */
|
||||||
{ "ConnectTo", upstreamip, TYPE_NAME },
|
{ "Name", tincname, TYPE_NAME },
|
||||||
{ "ConnectPort", upstreamport, TYPE_INT },
|
{ "ConnectTo", connectto, TYPE_NAME },
|
||||||
{ "ListenPort", listenport, TYPE_INT },
|
|
||||||
{ "MyOwnVPNIP", myvpnip, TYPE_IP },
|
|
||||||
{ "MyVirtualIP", myvpnip, TYPE_IP }, /* an alias */
|
|
||||||
{ "Passphrases", passphrasesdir, TYPE_NAME },
|
|
||||||
{ "PingTimeout", pingtimeout, TYPE_INT },
|
{ "PingTimeout", pingtimeout, TYPE_INT },
|
||||||
{ "TapDevice", tapdevice, TYPE_NAME },
|
{ "TapDevice", tapdevice, TYPE_NAME },
|
||||||
|
{ "PrivateKey", privatekey, TYPE_NAME },
|
||||||
{ "KeyExpire", keyexpire, TYPE_INT },
|
{ "KeyExpire", keyexpire, TYPE_INT },
|
||||||
{ "VpnMask", vpnmask, TYPE_IP },
|
|
||||||
{ "Hostnames", resolve_dns, TYPE_BOOL },
|
{ "Hostnames", resolve_dns, TYPE_BOOL },
|
||||||
{ "IndirectData", indirectdata, TYPE_BOOL },
|
|
||||||
{ "TCPonly", tcponly, TYPE_BOOL },
|
|
||||||
{ "Interface", interface, TYPE_NAME },
|
{ "Interface", interface, TYPE_NAME },
|
||||||
{ "InterfaceIP", interfaceip, TYPE_IP },
|
{ "InterfaceIP", interfaceip, TYPE_IP },
|
||||||
{ "Name", tincname, TYPE_NAME },
|
/* 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 },
|
||||||
{ NULL, 0, 0 }
|
{ NULL, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -136,34 +134,39 @@ cp
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Get variable from a section in a configfile. returns -1 on failure.
|
Parse a configuration file and put the results in the configuration tree
|
||||||
|
starting at *base.
|
||||||
*/
|
*/
|
||||||
int
|
int read_config_file(config_t **base, const char *fname)
|
||||||
readconfig(const char *fname, FILE *fp)
|
|
||||||
{
|
{
|
||||||
char *line, *temp_buf;
|
int err;
|
||||||
|
FILE *fp;
|
||||||
|
char line[MAXBUFSIZE]; /* There really should not be any line longer than this... */
|
||||||
char *p, *q;
|
char *p, *q;
|
||||||
int i, lineno = 0;
|
int i, err = -1, lineno = 0;
|
||||||
config_t *cfg;
|
config_t *cfg;
|
||||||
cp
|
cp
|
||||||
line = (char *)xmalloc(80 * sizeof(char));
|
if((fp = fopen (fname, "r")) == NULL)
|
||||||
temp_buf = (char *)xmalloc(80 * sizeof(char));
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
for(;;)
|
for(;;)
|
||||||
{
|
{
|
||||||
if(fgets(line, 80, fp) == NULL)
|
if(fgets(line, MAXBUFSIZE, fp) == NULL)
|
||||||
return 0;
|
|
||||||
|
|
||||||
while(!index(line, '\n'))
|
|
||||||
{
|
{
|
||||||
fgets(temp_buf, (strlen(line)+1) * 80, fp);
|
err = 0;
|
||||||
if(!temp_buf)
|
|
||||||
break;
|
break;
|
||||||
strcat(line, temp_buf);
|
|
||||||
line = (char *)xrealloc(line, (strlen(line)+1) * sizeof(char));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lineno++;
|
lineno++;
|
||||||
|
|
||||||
|
if(!index(line, '\n'))
|
||||||
|
{
|
||||||
|
syslog(LOG_ERR, _("Line %d too long while reading config file %s"), lineno, fname);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if((p = strtok(line, "\t\n\r =")) == NULL)
|
if((p = strtok(line, "\t\n\r =")) == NULL)
|
||||||
continue; /* no tokens on this line */
|
continue; /* no tokens on this line */
|
||||||
|
|
||||||
|
@ -176,50 +179,31 @@ cp
|
||||||
|
|
||||||
if(!hazahaza[i].name)
|
if(!hazahaza[i].name)
|
||||||
{
|
{
|
||||||
fprintf(stderr, _("%s: %d: Invalid variable name `%s'.\n"),
|
syslog(LOG_ERR, _("Invalid variable name on line %d while reading config file %s"),
|
||||||
fname, lineno, p);
|
lineno, fname);
|
||||||
return -1;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
|
if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
|
||||||
{
|
{
|
||||||
fprintf(stderr, _("%s: %d: No value given for `%s'.\n"),
|
fprintf(stderr, _("No value for variable on line %d while reading config file %s"),
|
||||||
fname, lineno, hazahaza[i].name);
|
lineno, fname);
|
||||||
return -1;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg = add_config_val(&config, hazahaza[i].argtype, q);
|
cfg = add_config_val(base, hazahaza[i].argtype, q);
|
||||||
if(cfg == NULL)
|
if(cfg == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, _("%s: %d: Invalid value `%s' for variable `%s'.\n"),
|
fprintf(stderr, _("Invalid value for variable on line %d while reading config file %s"),
|
||||||
fname, lineno, q, hazahaza[i].name);
|
lineno, fname);
|
||||||
return -1;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg->which = hazahaza[i].which;
|
cfg->which = hazahaza[i].which;
|
||||||
if(!config)
|
if(!config)
|
||||||
config = cfg;
|
config = cfg;
|
||||||
}
|
}
|
||||||
cp
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
wrapper function for readconfig
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
read_config_file(const char *fname)
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
FILE *fp;
|
|
||||||
cp
|
|
||||||
if((fp = fopen (fname, "r")) == NULL)
|
|
||||||
{
|
|
||||||
fprintf(stderr, _("Could not open %s: %s\n"), fname, strerror(errno));
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
err = readconfig(fname, fp);
|
|
||||||
fclose (fp);
|
fclose (fp);
|
||||||
cp
|
cp
|
||||||
return err;
|
return err;
|
||||||
|
@ -228,10 +212,8 @@ cp
|
||||||
/*
|
/*
|
||||||
Look up the value of the config option type
|
Look up the value of the config option type
|
||||||
*/
|
*/
|
||||||
const config_t *
|
const config_t *get_config_val(config_t *p, which_t type)
|
||||||
get_config_val(which_t type)
|
|
||||||
{
|
{
|
||||||
config_t *p;
|
|
||||||
cp
|
cp
|
||||||
for(p = config; p != NULL; p = p->next)
|
for(p = config; p != NULL; p = p->next)
|
||||||
if(p->which == type)
|
if(p->which == type)
|
||||||
|
@ -245,10 +227,8 @@ cp
|
||||||
Support for multiple config lines.
|
Support for multiple config lines.
|
||||||
Index is used to get a specific value, 0 being the first, 1 the second etc.
|
Index is used to get a specific value, 0 being the first, 1 the second etc.
|
||||||
*/
|
*/
|
||||||
const config_t *
|
const config_t *get_next_config_val(config_t *p, which_t type, int index)
|
||||||
get_next_config_val(which_t type, int index)
|
|
||||||
{
|
{
|
||||||
config_t *p;
|
|
||||||
cp
|
cp
|
||||||
for(p = config; p != NULL; p = p->next)
|
for(p = config; p != NULL; p = p->next)
|
||||||
if(p->which == type)
|
if(p->which == type)
|
||||||
|
@ -262,11 +242,11 @@ cp
|
||||||
/*
|
/*
|
||||||
Remove the complete configuration tree.
|
Remove the complete configuration tree.
|
||||||
*/
|
*/
|
||||||
void clear_config()
|
void clear_config(config_t **base)
|
||||||
{
|
{
|
||||||
config_t *p, *next;
|
config_t *p, *next;
|
||||||
cp
|
cp
|
||||||
for(p = config; p != NULL; p = next)
|
for(p = *base; p != NULL; p = next)
|
||||||
{
|
{
|
||||||
next = p->next;
|
next = p->next;
|
||||||
if(p->data.ptr && (p->argtype == TYPE_NAME))
|
if(p->data.ptr && (p->argtype == TYPE_NAME))
|
||||||
|
@ -275,6 +255,6 @@ cp
|
||||||
}
|
}
|
||||||
free(p);
|
free(p);
|
||||||
}
|
}
|
||||||
config = NULL;
|
*base = NULL;
|
||||||
cp
|
cp
|
||||||
}
|
}
|
||||||
|
|
34
src/conf.h
34
src/conf.h
|
@ -17,7 +17,7 @@
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
$Id: conf.h,v 1.6.4.9 2000/09/14 14:34:38 zarq Exp $
|
$Id: conf.h,v 1.6.4.10 2000/10/11 13:42:52 guus Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __TINC_CONF_H__
|
#ifndef __TINC_CONF_H__
|
||||||
|
@ -37,22 +37,26 @@ typedef union data_t {
|
||||||
} data_t;
|
} data_t;
|
||||||
|
|
||||||
typedef enum which_t {
|
typedef enum which_t {
|
||||||
passphrasesdir = 1,
|
tincname = 1,
|
||||||
upstreamip,
|
connectto,
|
||||||
upstreamport,
|
|
||||||
listenport,
|
|
||||||
myvpnip,
|
|
||||||
tapdevice,
|
|
||||||
allowconnect,
|
|
||||||
pingtimeout,
|
pingtimeout,
|
||||||
|
tapdevice,
|
||||||
|
privatekey,
|
||||||
keyexpire,
|
keyexpire,
|
||||||
vpnmask,
|
|
||||||
resolve_dns,
|
resolve_dns,
|
||||||
indirectdata,
|
|
||||||
tcponly,
|
|
||||||
interface,
|
interface,
|
||||||
interfaceip,
|
interfaceip,
|
||||||
tincname,
|
configuration
|
||||||
|
address,
|
||||||
|
port,
|
||||||
|
publickey,
|
||||||
|
subnet,
|
||||||
|
restricthosts,
|
||||||
|
restrictsubnets,
|
||||||
|
restrictaddress,
|
||||||
|
restrictport,
|
||||||
|
indirectdata,
|
||||||
|
tcponly,
|
||||||
} which_t;
|
} which_t;
|
||||||
|
|
||||||
typedef struct config_t {
|
typedef struct config_t {
|
||||||
|
@ -62,6 +66,12 @@ typedef struct config_t {
|
||||||
data_t data;
|
data_t data;
|
||||||
} config_t;
|
} config_t;
|
||||||
|
|
||||||
|
typedef struct internal_config_t {
|
||||||
|
char *name;
|
||||||
|
enum which_t which;
|
||||||
|
int argtype;
|
||||||
|
} internal_config_t;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
stupid_false = 1,
|
stupid_false = 1,
|
||||||
stupid_true
|
stupid_true
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
$Id: protocol.c,v 1.28.4.36 2000/09/26 14:06:06 guus Exp $
|
$Id: protocol.c,v 1.28.4.37 2000/10/11 13:42:52 guus Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
@ -187,7 +187,7 @@ cp
|
||||||
|
|
||||||
/* Load information about peer */
|
/* Load information about peer */
|
||||||
|
|
||||||
if(!read_id(cl))
|
if(!read_host_config(cl))
|
||||||
{
|
{
|
||||||
syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
|
syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in a new issue