projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26eca51
)
Don't expect a response from tincd after sending REQ_STOP.
author
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 8 Feb 2013 15:44:50 +0000
(16:44 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 8 Feb 2013 15:44:50 +0000
(16:44 +0100)
src/tincctl.c
patch
|
blob
|
history
diff --git
a/src/tincctl.c
b/src/tincctl.c
index
7b44881
..
eaf14e0
100644
(file)
--- a/
src/tincctl.c
+++ b/
src/tincctl.c
@@
-834,16
+834,10
@@
static int cmd_stop(int argc, char *argv[]) {
}
sendline(fd, "%d %d", CONTROL, REQ_STOP);
}
sendline(fd, "%d %d", CONTROL, REQ_STOP);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_STOP || result) {
- fprintf(stderr, "Could not stop tinc daemon.\n");
- return 1;
- }
- // Wait for tincd to close the connection...
- fd_set r;
- FD_ZERO(&r);
- FD_SET(fd, &r);
- select(fd + 1, &r, NULL, NULL, NULL);
+ while(recvline(fd, line, sizeof line)) {
+ // Wait for tincd to close the connection...
+ }
#else
if(!remove_service())
return 1;
#else
if(!remove_service())
return 1;