projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More consistent variable naming.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
d0a2d2d
..
49b78bb
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
6 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,26
+19,26
@@
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"
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "conf.h"
#include "logger.h"
#include "netutl.h" /* for str2address */
#include "utils.h" /* for cp */
#include "xalloc.h"
#include "conf.h"
#include "logger.h"
#include "netutl.h" /* for str2address */
#include "utils.h" /* for cp */
#include "xalloc.h"
-
avl
_tree_t *config_tree;
+
splay
_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 */
-static int config_compare(const config_t *a, const config_t *b)
-{
+static int config_compare(const config_t *a, const config_t *b) {
int result;
result = strcasecmp(a->variable, b->variable);
int result;
result = strcasecmp(a->variable, b->variable);
@@
-54,30
+54,26
@@
static int config_compare(const config_t *a, const config_t *b)
return strcmp(a->file, b->file);
}
return strcmp(a->file, b->file);
}
-void init_configuration(avl_tree_t ** config_tree)
-{
+void init_configuration(splay_tree_t ** config_tree) {
cp();
cp();
- *config_tree =
avl_alloc_tree((avl_compare_t) config_compare, (avl
_action_t) free_config);
+ *config_tree =
splay_alloc_tree((splay_compare_t) config_compare, (splay
_action_t) free_config);
}
}
-void exit_configuration(avl_tree_t ** config_tree)
-{
+void exit_configuration(splay_tree_t ** config_tree) {
cp();
cp();
-
avl
_delete_tree(*config_tree);
+
splay
_delete_tree(*config_tree);
*config_tree = NULL;
}
*config_tree = NULL;
}
-config_t *new_config(void)
-{
+config_t *new_config(void) {
cp();
return xmalloc_and_zero(sizeof(config_t));
}
cp();
return xmalloc_and_zero(sizeof(config_t));
}
-void free_config(config_t *cfg)
-{
+void free_config(config_t *cfg) {
cp();
if(cfg->variable)
cp();
if(cfg->variable)
@@
-92,15
+88,13
@@
void free_config(config_t *cfg)
free(cfg);
}
free(cfg);
}
-void config_add(avl_tree_t *config_tree, config_t *cfg)
-{
+void config_add(splay_tree_t *config_tree, config_t *cfg) {
cp();
cp();
-
avl
_insert(config_tree, cfg);
+
splay
_insert(config_tree, cfg);
}
}
-config_t *lookup_config(const avl_tree_t *config_tree, char *variable)
-{
+config_t *lookup_config(splay_tree_t *config_tree, char *variable) {
config_t cfg, *found;
cp();
config_t cfg, *found;
cp();
@@
-109,7
+103,7
@@
config_t *lookup_config(const avl_tree_t *config_tree, char *variable)
cfg.file = "";
cfg.line = 0;
cfg.file = "";
cfg.line = 0;
- found =
avl
_search_closest_greater(config_tree, &cfg);
+ found =
splay
_search_closest_greater(config_tree, &cfg);
if(!found)
return NULL;
if(!found)
return NULL;
@@
-120,14
+114,13
@@
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)
-{
- avl_node_t *node;
+config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *cfg) {
+ splay_node_t *node;
config_t *found;
cp();
config_t *found;
cp();
- node =
avl
_search_node(config_tree, cfg);
+ node =
splay
_search_node(config_tree, cfg);
if(node) {
if(node->next) {
if(node) {
if(node->next) {
@@
-141,8
+134,7
@@
config_t *lookup_config_next(const avl_tree_t *config_tree, const config_t *cfg)
return NULL;
}
return NULL;
}
-bool get_config_bool(const config_t *cfg, bool *result)
-{
+bool get_config_bool(const config_t *cfg, bool *result) {
cp();
if(!cfg)
cp();
if(!cfg)
@@
-162,8
+154,7
@@
bool get_config_bool(const config_t *cfg, bool *result)
return false;
}
return false;
}
-bool get_config_int(const config_t *cfg, int *result)
-{
+bool get_config_int(const config_t *cfg, int *result) {
cp();
if(!cfg)
cp();
if(!cfg)
@@
-178,8
+169,7
@@
bool get_config_int(const config_t *cfg, int *result)
return false;
}
return false;
}
-bool get_config_string(const config_t *cfg, char **result)
-{
+bool get_config_string(const config_t *cfg, char **result) {
cp();
if(!cfg)
cp();
if(!cfg)
@@
-190,8
+180,7
@@
bool get_config_string(const config_t *cfg, char **result)
return true;
}
return true;
}
-bool get_config_address(const config_t *cfg, struct addrinfo **result)
-{
+bool get_config_address(const config_t *cfg, struct addrinfo **result) {
struct addrinfo *ai;
cp();
struct addrinfo *ai;
cp();
@@
-212,8
+201,7
@@
bool get_config_address(const config_t *cfg, struct addrinfo **result)
return false;
}
return false;
}
-bool get_config_subnet(const config_t *cfg, subnet_t ** result)
-{
+bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
subnet_t subnet = {0};
cp();
subnet_t subnet = {0};
cp();
@@
-253,8
+241,7
@@
bool get_config_subnet(const config_t *cfg, subnet_t ** result)
given, and buf needs to be expanded, the var pointed to by buflen
will be increased.
*/
given, and buf needs to be expanded, the var pointed to by buflen
will be increased.
*/
-static char *readline(FILE * fp, char **buf, size_t *buflen)
-{
+static char *readline(FILE * fp, char **buf, size_t *buflen) {
char *newline = NULL;
char *p;
char *line; /* The array that contains everything that has been read so far */
char *newline = NULL;
char *p;
char *line; /* The array that contains everything that has been read so far */
@@
-316,12
+303,11
@@
static char *readline(FILE * fp, char **buf, size_t *buflen)
Parse a configuration file and put the results in the configuration tree
starting at *base.
*/
Parse a configuration file and put the results in the configuration tree
starting at *base.
*/
-int read_config_file(avl_tree_t *config_tree, const char *fname)
-{
+int read_config_file(splay_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;
@@
-372,6
+358,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
+371,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);
@@
-402,8
+393,7
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
return err;
}
return err;
}
-bool read_server_config()
-{
+bool read_server_config() {
char *fname;
int x;
char *fname;
int x;
@@
-421,8
+411,7
@@
bool read_server_config()
return x == 0;
}
return x == 0;
}
-FILE *ask_and_open(const char *filename, const char *what, const char *mode)
-{
+FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
FILE *r;
char *directory;
char *fn;
FILE *r;
char *directory;
char *fn;