projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing cleanup functions in close_network_connections().
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
d0a2d2d
..
052b20f
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-1,9
+1,9
@@
/*
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
/*
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
- 1998-200
3 Ivo Timmermans <ivo@o2w.nl>
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
- 2000 Cris van Pelt
<tribbel@arise.dhs.org>
+ 1998-200
5 Ivo Timmermans
+ 2000-200
8 Guus Sliepen <guus@tinc-vpn
.org>
+ 2000 Cris van Pelt
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-19,7
+19,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.77 2003/12/12 19:52:24 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-33,7
+33,8
@@
avl_tree_t *config_tree;
avl_tree_t *config_tree;
-int pingtimeout = 0; /* seconds before timeout */
+int pinginterval = 0; /* seconds between pings */
+int pingtimeout = 0; /* seconds to wait for response */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
@@
-99,7
+100,7
@@
void config_add(avl_tree_t *config_tree, config_t *cfg)
avl_insert(config_tree, cfg);
}
avl_insert(config_tree, cfg);
}
-config_t *lookup_config(
const
avl_tree_t *config_tree, char *variable)
+config_t *lookup_config(avl_tree_t *config_tree, char *variable)
{
config_t cfg, *found;
{
config_t cfg, *found;
@@
-120,7
+121,7
@@
config_t *lookup_config(const avl_tree_t *config_tree, char *variable)
return found;
}
return found;
}
-config_t *lookup_config_next(
const
avl_tree_t *config_tree, const config_t *cfg)
+config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg)
{
avl_node_t *node;
config_t *found;
{
avl_node_t *node;
config_t *found;
@@
-321,7
+322,7
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
int err = -2; /* Parse error */
FILE *fp;
char *buffer, *line;
int err = -2; /* Parse error */
FILE *fp;
char *buffer, *line;
- char *variable, *value;
+ char *variable, *value
, *eol
;
int lineno = 0;
int len;
bool ignore = false;
int lineno = 0;
int len;
bool ignore = false;
@@
-342,6
+343,11
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
buffer = xmalloc(bufsize);
for(;;) {
buffer = xmalloc(bufsize);
for(;;) {
+ if(feof(fp)) {
+ err = 0;
+ break;
+ }
+
line = readline(fp, &buffer, &bufsize);
if(!line) {
line = readline(fp, &buffer, &bufsize);
if(!line) {
@@
-349,11
+355,6
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
break;
}
break;
}
- if(feof(fp)) {
- err = 0;
- break;
- }
-
lineno++;
if(!*line || *line == '#')
lineno++;
if(!*line || *line == '#')
@@
-372,6
+373,10
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
variable = value = line;
variable = value = line;
+ eol = line + strlen(line);
+ while(strchr("\t ", *--eol))
+ *eol = '\0';
+
len = strcspn(value, "\t =");
value += len;
value += strspn(value, "\t ");
len = strcspn(value, "\t =");
value += len;
value += strspn(value, "\t ");
@@
-381,6
+386,7
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
}
variable[len] = '\0';
}
variable[len] = '\0';
+
if(!*value) {
logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
variable, lineno, fname);
if(!*value) {
logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
variable, lineno, fname);