From d21f63d5b39280b653ca72a272f3a70c7c3f03be Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 8 Feb 2013 16:44:50 +0100 Subject: [PATCH] Don't expect a response from tincd after sending REQ_STOP. --- src/tincctl.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/tincctl.c b/src/tincctl.c index 7b44881f..eaf14e03 100644 --- 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); - 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; -- 2.20.1