projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sr.ht CI: update FreeBSD and OpenBSD image versions
[tinc]
/
src
/
tincctl.c
diff --git
a/src/tincctl.c
b/src/tincctl.c
index
2ed286a
..
3af0f1f
100644
(file)
--- a/
src/tincctl.c
+++ b/
src/tincctl.c
@@
-80,7
+80,7
@@
char *scriptextension = defaultextension;
static char *prompt;
char *device = NULL;
char *iface = NULL;
static char *prompt;
char *device = NULL;
char *iface = NULL;
-
in
t debug_level = -1;
+
debug_
t debug_level = -1;
typedef enum option_t {
OPT_BAD_OPTION = '?',
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))) {
}
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) {
ssize_t nrecv = recv(fd, buffer + blen, sizeof(buffer) - blen, 0);
if(nrecv == -1 && sockerrno == EINTR) {