X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Ftincctl.c;h=3af0f1f883406d7a3d925bda961630a307dfef17;hb=1aa8ac8c41ab8580fce1956086d7e6c7e84a09ee;hp=2ed286a62d95881ede05da7ddd97e0c7dd7433f7;hpb=9235256116574927657a93944ef1b21e255e771b;p=tinc diff --git a/src/tincctl.c b/src/tincctl.c index 2ed286a6..3af0f1f8 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -80,7 +80,7 @@ char *scriptextension = defaultextension; static char *prompt; char *device = NULL; char *iface = NULL; -int debug_level = -1; +debug_t debug_level = -1; typedef enum option_t { OPT_BAD_OPTION = '?', @@ -495,6 +495,10 @@ bool recvline(int fd, char *line, size_t len) { } while(!(newline = memchr(buffer, '\n', blen))) { + if(!wait_socket_recv(fd)) { + return false; + } + ssize_t nrecv = recv(fd, buffer + blen, sizeof(buffer) - blen, 0); if(nrecv == -1 && sockerrno == EINTR) {