upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix windows unbound-control no cert bad file descriptor error.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4746 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-06-19 13:13:35 +00:00
parent 9ccf611954
commit 8c044a616b
3 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
daemon/remote.c
View file

@ -568,11 +568,15 @@ ssl_print_text(RES* res, const char* text)
} else { } else {
size_t at = 0; size_t at = 0;
while(at < strlen(text)) { while(at < strlen(text)) {
ssize_t r = write(res->fd, text+at, strlen(text)-at); ssize_t r = send(res->fd, text+at, strlen(text)-at, 0);
if(r == -1) { if(r == -1) {
if(errno == EAGAIN || errno == EINTR) if(errno == EAGAIN || errno == EINTR)
continue; continue;
log_err("could not write: %s", strerror(errno)); #ifndef USE_WINSOCK
log_err("could not send: %s", strerror(errno));
#else
log_err("could not send: %s", wsa_strerror(WSAGetLastError()));
#endif
return 0; return 0;
} }
at += r; at += r;
@ -621,7 +625,7 @@ ssl_read_line(RES* res, char* buf, size_t max)
} }
} else { } else {
while(1) { while(1) {
ssize_t rr = read(res->fd, buf+len, 1); ssize_t rr = recv(res->fd, buf+len, 1, 0);
if(rr <= 0) { if(rr <= 0) {
if(rr == 0) { if(rr == 0) {
buf[len] = 0; buf[len] = 0;
@ -629,7 +633,11 @@ ssl_read_line(RES* res, char* buf, size_t max)
} }
if(errno == EINTR || errno == EAGAIN) if(errno == EINTR || errno == EAGAIN)
continue; continue;
log_err("could not read: %s", strerror(errno)); #ifndef USE_WINSOCK
log_err("could not recv: %s", strerror(errno));
#else
log_err("could not recv: %s", wsa_strerror(WSAGetLastError()));
#endif
return 0; return 0;
} }
break; break;
@ -3007,12 +3015,16 @@ handle_req(struct daemon_remote* rc, struct rc_state* s, RES* res)
} }
} else { } else {
while(1) { while(1) {
ssize_t rr = read(res->fd, magic, sizeof(magic)-1); ssize_t rr = recv(res->fd, magic, sizeof(magic)-1, 0);
if(rr <= 0) { if(rr <= 0) {
if(rr == 0) return; if(rr == 0) return;
if(errno == EINTR || errno == EAGAIN) if(errno == EINTR || errno == EAGAIN)
continue; continue;
log_err("could not read: %s", strerror(errno)); #ifndef USE_WINSOCK
log_err("could not recv: %s", strerror(errno));
#else
log_err("could not recv: %s", wsa_strerror(WSAGetLastError()));
#endif
return; return;
} }
r = (int)rr; r = (int)rr;

1
doc/Changelog
View file

@ -3,6 +3,7 @@
more closely. more closely.
- Windows example service.conf edited with more windows specific - Windows example service.conf edited with more windows specific
configuration. configuration.
- Fix windows unbound-control no cert bad file descriptor error.
18 June 2018: Wouter 18 June 2018: Wouter
- Fix that control-use-cert: no works for 127.0.0.1 to disable certs. - Fix that control-use-cert: no works for 127.0.0.1 to disable certs.

17
smallapp/unbound-control.c
View file

@ -616,13 +616,17 @@ remote_read(SSL* ssl, int fd, char* buf, size_t len)
} }
buf[r] = 0; buf[r] = 0;
} else { } else {
ssize_t rr = read(fd, buf, len-1); ssize_t rr = recv(fd, buf, len-1, 0);
if(rr <= 0) { if(rr <= 0) {
if(rr == 0) { if(rr == 0) {
/* EOF */ /* EOF */
return 0; return 0;
} }
fatal_exit("could not read: %s", strerror(errno)); #ifndef USE_WINSOCK
fatal_exit("could not recv: %s", strerror(errno));
#else
fatal_exit("could not recv: %s", wsa_strerror(WSAGetLastError()));
#endif
} }
buf[rr] = 0; buf[rr] = 0;
} }
@ -637,8 +641,13 @@ remote_write(SSL* ssl, int fd, const char* buf, size_t len)
if(SSL_write(ssl, buf, (int)len) <= 0) if(SSL_write(ssl, buf, (int)len) <= 0)
ssl_err("could not SSL_write"); ssl_err("could not SSL_write");
} else { } else {
if(write(fd, buf, len) < (ssize_t)len) if(send(fd, buf, len, 0) < (ssize_t)len) {
fatal_exit("could not write: %s", strerror(errno)); #ifndef USE_WINSOCK
fatal_exit("could not send: %s", strerror(errno));
#else
fatal_exit("could not send: %s", wsa_strerror(WSAGetLastError()));
#endif
}
} }
} }