projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove checkpoint tracing.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
5058d31
..
688974b
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-36,8
+36,7
@@
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);
@@
-53,32
+52,20
@@
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)
-{
- cp();
-
+void init_configuration(avl_tree_t ** config_tree) {
*config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
}
*config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
}
-void exit_configuration(avl_tree_t ** config_tree)
-{
- cp();
-
+void exit_configuration(avl_tree_t ** config_tree) {
avl_delete_tree(*config_tree);
*config_tree = NULL;
}
avl_delete_tree(*config_tree);
*config_tree = NULL;
}
-config_t *new_config(void)
-{
- cp();
-
+config_t *new_config(void) {
return xmalloc_and_zero(sizeof(config_t));
}
return xmalloc_and_zero(sizeof(config_t));
}
-void free_config(config_t *cfg)
-{
- cp();
-
+void free_config(config_t *cfg) {
if(cfg->variable)
free(cfg->variable);
if(cfg->variable)
free(cfg->variable);
@@
-91,19
+78,13
@@
void free_config(config_t *cfg)
free(cfg);
}
free(cfg);
}
-void config_add(avl_tree_t *config_tree, config_t *cfg)
-{
- cp();
-
+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(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;
- cp();
-
cfg.variable = variable;
cfg.file = "";
cfg.line = 0;
cfg.variable = variable;
cfg.file = "";
cfg.line = 0;
@@
-119,13
+100,10
@@
config_t *lookup_config(avl_tree_t *config_tree, char *variable)
return found;
}
return found;
}
-config_t *lookup_config_next(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;
- cp();
-
node = avl_search_node(config_tree, cfg);
if(node) {
node = avl_search_node(config_tree, cfg);
if(node) {
@@
-140,10
+118,7
@@
config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg)
return NULL;
}
return NULL;
}
-bool get_config_bool(const config_t *cfg, bool *result)
-{
- cp();
-
+bool get_config_bool(const config_t *cfg, bool *result) {
if(!cfg)
return false;
if(!cfg)
return false;
@@
-161,10
+136,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)
-{
- cp();
-
+bool get_config_int(const config_t *cfg, int *result) {
if(!cfg)
return false;
if(!cfg)
return false;
@@
-177,10
+149,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)
-{
- cp();
-
+bool get_config_string(const config_t *cfg, char **result) {
if(!cfg)
return false;
if(!cfg)
return false;
@@
-189,12
+158,9
@@
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;
struct addrinfo *ai;
- cp();
-
if(!cfg)
return false;
if(!cfg)
return false;
@@
-211,12
+177,9
@@
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};
subnet_t subnet = {0};
- cp();
-
if(!cfg)
return false;
if(!cfg)
return false;
@@
-252,8
+215,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 */
@@
-317,8
+279,7
@@
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(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;
@@
-329,8
+290,6
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
config_t *cfg;
size_t bufsize;
config_t *cfg;
size_t bufsize;
- cp();
-
fp = fopen(fname, "r");
if(!fp) {
fp = fopen(fname, "r");
if(!fp) {
@@
-408,13
+367,10
@@
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;
- cp();
-
xasprintf(&fname, "%s/tinc.conf", confbase);
x = read_config_file(config_tree, fname);
xasprintf(&fname, "%s/tinc.conf", confbase);
x = read_config_file(config_tree, fname);
@@
-427,8
+383,7
@@
bool read_server_config()
return x == 0;
}
return x == 0;
}
-FILE *ask_and_open(const char *filename, const char *what)
-{
+FILE *ask_and_open(const char *filename, const char *what) {
FILE *r;
char *directory;
char *fn;
FILE *r;
char *directory;
char *fn;