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
e7703c1
..
688974b
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-53,27
+53,19
@@
static int config_compare(const config_t *a, const config_t *b) {
}
void init_configuration(avl_tree_t ** config_tree) {
}
void init_configuration(avl_tree_t ** config_tree) {
- cp();
-
*config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
}
void exit_configuration(avl_tree_t ** config_tree) {
*config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
}
void exit_configuration(avl_tree_t ** config_tree) {
- cp();
-
avl_delete_tree(*config_tree);
*config_tree = NULL;
}
config_t *new_config(void) {
avl_delete_tree(*config_tree);
*config_tree = NULL;
}
config_t *new_config(void) {
- cp();
-
return xmalloc_and_zero(sizeof(config_t));
}
void free_config(config_t *cfg) {
return xmalloc_and_zero(sizeof(config_t));
}
void free_config(config_t *cfg) {
- cp();
-
if(cfg->variable)
free(cfg->variable);
if(cfg->variable)
free(cfg->variable);
@@
-87,16
+79,12
@@
void free_config(config_t *cfg) {
}
void config_add(avl_tree_t *config_tree, config_t *cfg) {
}
void config_add(avl_tree_t *config_tree, config_t *cfg) {
- cp();
-
avl_insert(config_tree, cfg);
}
config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
config_t cfg, *found;
avl_insert(config_tree, cfg);
}
config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
config_t cfg, *found;
- cp();
-
cfg.variable = variable;
cfg.file = "";
cfg.line = 0;
cfg.variable = variable;
cfg.file = "";
cfg.line = 0;
@@
-116,8
+104,6
@@
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) {
@@
-133,8
+119,6
@@
config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) {
}
bool get_config_bool(const config_t *cfg, bool *result) {
}
bool get_config_bool(const config_t *cfg, bool *result) {
- cp();
-
if(!cfg)
return false;
if(!cfg)
return false;
@@
-153,8
+137,6
@@
bool get_config_bool(const config_t *cfg, bool *result) {
}
bool get_config_int(const config_t *cfg, int *result) {
}
bool get_config_int(const config_t *cfg, int *result) {
- cp();
-
if(!cfg)
return false;
if(!cfg)
return false;
@@
-168,8
+150,6
@@
bool get_config_int(const config_t *cfg, int *result) {
}
bool get_config_string(const config_t *cfg, char **result) {
}
bool get_config_string(const config_t *cfg, char **result) {
- cp();
-
if(!cfg)
return false;
if(!cfg)
return false;
@@
-181,8
+161,6
@@
bool get_config_string(const config_t *cfg, char **result) {
bool get_config_address(const config_t *cfg, struct addrinfo **result) {
struct addrinfo *ai;
bool get_config_address(const config_t *cfg, struct addrinfo **result) {
struct addrinfo *ai;
- cp();
-
if(!cfg)
return false;
if(!cfg)
return false;
@@
-202,8
+180,6
@@
bool get_config_address(const config_t *cfg, struct addrinfo **result) {
bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
subnet_t subnet = {0};
bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
subnet_t subnet = {0};
- cp();
-
if(!cfg)
return false;
if(!cfg)
return false;
@@
-314,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) {
@@
-397,8
+371,6
@@
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);