projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor outgoing connection handling.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
d50dc52
..
b1529e5
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-373,7
+373,7
@@
bool read_server_config(void) {
read_config_options(config_tree, NULL);
read_config_options(config_tree, NULL);
- xasprintf(&fname, "%s
/
tinc.conf", confbase);
+ xasprintf(&fname, "%s
" SLASH "
tinc.conf", confbase);
x = read_config_file(config_tree, fname);
if(!x) { /* System error: complain */
x = read_config_file(config_tree, fname);
if(!x) { /* System error: complain */
@@
-385,14
+385,14
@@
bool read_server_config(void) {
return x;
}
return x;
}
-bool read_
connection_config(connection_t *c
) {
+bool read_
host_config(splay_tree_t *config_tree, const char *name
) {
char *fname;
bool x;
char *fname;
bool x;
- read_config_options(c
->config_tree, c->
name);
+ read_config_options(c
onfig_tree,
name);
- xasprintf(&fname, "%s
/hosts/%s", confbase, c->
name);
- x = read_config_file(c
->c
onfig_tree, fname);
+ xasprintf(&fname, "%s
" SLASH "hosts" SLASH "%s", confbase,
name);
+ x = read_config_file(config_tree, fname);
free(fname);
return x;
free(fname);
return x;
@@
-400,7
+400,7
@@
bool read_connection_config(connection_t *c) {
bool append_config_file(const char *name, const char *key, const char *value) {
char *fname;
bool append_config_file(const char *name, const char *key, const char *value) {
char *fname;
- xasprintf(&fname, "%s
/hosts/
%s", confbase, name);
+ xasprintf(&fname, "%s
" SLASH "hosts" SLASH "
%s", confbase, name);
FILE *fp = fopen(fname, "a");
FILE *fp = fopen(fname, "a");
@@
-411,8
+411,7
@@
bool append_config_file(const char *name, const char *key, const char *value) {
fclose(fp);
}
fclose(fp);
}
-
free(fname);
free(fname);
- return fp;
+ return fp
!= NULL
;
}
}