projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of black:tinc
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
f55fa82
..
1560541
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-3,7
+3,7
@@
Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
2000-2010 Guus Sliepen <guus@tinc-vpn.org>
Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
2000-2010 Guus Sliepen <guus@tinc-vpn.org>
- 2010 Julien Muchembled <jm@jmuchemb.eu>
+ 2010
-2011
Julien Muchembled <jm@jmuchemb.eu>
2000 Cris van Pelt
This program is free software; you can redistribute it and/or modify
2000 Cris van Pelt
This program is free software; you can redistribute it and/or modify
@@
-26,6
+26,7
@@
#include "avl_tree.h"
#include "connection.h"
#include "conf.h"
#include "avl_tree.h"
#include "connection.h"
#include "conf.h"
+#include "list.h"
#include "logger.h"
#include "netutl.h" /* for str2address */
#include "protocol.h"
#include "logger.h"
#include "netutl.h" /* for str2address */
#include "protocol.h"
@@
-92,7
+93,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(avl_tree_t *config_tree, char *variable) {
+config_t *lookup_config(
const
avl_tree_t *config_tree, char *variable) {
config_t cfg, *found;
cfg.variable = variable;
config_t cfg, *found;
cfg.variable = variable;
@@
-110,7
+111,7
@@
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(
const
avl_tree_t *config_tree, const config_t *cfg) {
avl_node_t *node;
config_t *found;
avl_node_t *node;
config_t *found;
@@
-188,7
+189,7
@@
bool get_config_address(const config_t *cfg, struct addrinfo **result) {
}
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 = {
NULL
};
if(!cfg)
return false;
if(!cfg)
return false;
@@
-368,7
+369,7
@@
void read_config_options(avl_tree_t *config_tree, const char *prefix) {
}
}
}
}
-bool read_server_config() {
+bool read_server_config(
void
) {
char *fname;
bool x;
char *fname;
bool x;