projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Tinc.py into tinc-gui to simplify make install.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
bf8183f
..
099b77d
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-26,6
+26,7
@@
#include "splay_tree.h"
#include "connection.h"
#include "conf.h"
#include "splay_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"
@@
-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(splay_tree_t *config_tree, const char *prefix) {
}
}
}
}
-bool read_server_config() {
+bool read_server_config(
void
) {
char *fname;
bool x;
char *fname;
bool x;