projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve subprocess behavior in tinc start command.
[tinc]
/
src
/
control.c
diff --git
a/src/control.c
b/src/control.c
index
4562749
..
98eae80
100644
(file)
--- a/
src/control.c
+++ b/
src/control.c
@@
-106,7
+106,7
@@
bool control_h(connection_t *c, const char *request) {
for list_each(connection_t, other, connection_list) {
if(strcmp(other->name, name))
continue;
for list_each(connection_t, other, connection_list) {
if(strcmp(other->name, name))
continue;
- terminate_connection(other, other->
status.activ
e);
+ terminate_connection(other, other->
edg
e);
found = true;
}
found = true;
}
@@
-178,7
+178,7
@@
bool init_control(void) {
#ifndef HAVE_MINGW
int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if(unix_fd < 0) {
#ifndef HAVE_MINGW
int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if(unix_fd < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(
sock
errno));
return false;
}
return false;
}
@@
-198,12
+198,12
@@
bool init_control(void) {
umask(mask);
if(result < 0) {
umask(mask);
if(result < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(
sock
errno));
return false;
}
if(listen(unix_fd, 3) < 0) {
return false;
}
if(listen(unix_fd, 3) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(
sock
errno));
return false;
}
return false;
}