projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused po/ directory.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
1636808
..
1a45041
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-278,7
+278,7
@@
int reload_configuration(void) {
read_config_options(config_tree, NULL);
read_config_options(config_tree, NULL);
- xasprintf(&fname, "%s
/hosts/
%s", confbase, myself->name);
+ xasprintf(&fname, "%s
" SLASH "hosts" SLASH "
%s", confbase, myself->name);
read_config_file(config_tree, fname);
free(fname);
read_config_file(config_tree, fname);
free(fname);
@@
-303,7
+303,7
@@
int reload_configuration(void) {
c->outgoing = NULL;
}
c->outgoing = NULL;
}
- xasprintf(&fname, "%s
/hosts/
%s", confbase, c->name);
+ xasprintf(&fname, "%s
" SLASH "hosts" SLASH "
%s", confbase, c->name);
if(stat(fname, &s) || s.st_mtime > last_config_check)
terminate_connection(c, c->status.active);
free(fname);
if(stat(fname, &s) || s.st_mtime > last_config_check)
terminate_connection(c, c->status.active);
free(fname);
@@
-344,7
+344,7
@@
int reload_configuration(void) {
for(node = myself->subnet_tree->head; node; node = node->next) {
subnet_t *subnet = node->data;
for(node = myself->subnet_tree->head; node; node = node->next) {
subnet_t *subnet = node->data;
- logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d\n", subnet, subnet->expires);
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d\n", subnet,
(int)
subnet->expires);
if(!subnet->expires)
subnet->expires = 1;
}
if(!subnet->expires)
subnet->expires = 1;
}
@@
-356,7
+356,7
@@
int reload_configuration(void) {
continue;
if((s2 = lookup_subnet(myself, subnet))) {
continue;
if((s2 = lookup_subnet(myself, subnet))) {
- logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d\n", s2, s2->expires);
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d\n", s2,
(int)
s2->expires);
if(s2->expires == 1)
s2->expires = 0;
if(s2->expires == 1)
s2->expires = 0;