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

- Squelch SSL read and write connection reset by peer and broken pipe

Browse source 
messages.  Verbosity 2 and higher enables them.


git-svn-id: file:///svn/unbound/trunk@5158 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2019-04-11 15:04:32 +00:00
parent d1150541bb
commit c8a56bfa8f
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -7,6 +7,8 @@
SOA serial probes. This fixes that probes fail because earlier SOA serial probes. This fixes that probes fail because earlier
probe addresses are unreachable. probe addresses are unreachable.
- Fix that auth zone fails over to next master for timeout in tcp. - Fix that auth zone fails over to next master for timeout in tcp.
- Squelch SSL read and write connection reset by peer and broken pipe
messages. Verbosity 2 and higher enables them.
8 April 2019: Wouter 8 April 2019: Wouter
- Fix to use event_assign with libevent for thread-safety. - Fix to use event_assign with libevent for thread-safety.

24
util/netevent.c
View file

@ -1192,6 +1192,10 @@ ssl_handle_read(struct comm_point* c)
comm_point_listen_for_rw(c, 0, 1); comm_point_listen_for_rw(c, 0, 1);
return 1; return 1;
} else if(want == SSL_ERROR_SYSCALL) { } else if(want == SSL_ERROR_SYSCALL) {
#ifdef ECONNRESET
if(errno == ECONNRESET && verbosity < 2)
return 0; /* silence reset by peer */
#endif
if(errno != 0) if(errno != 0)
log_err("SSL_read syscall: %s", log_err("SSL_read syscall: %s",
strerror(errno)); strerror(errno));
@ -1236,6 +1240,10 @@ ssl_handle_read(struct comm_point* c)
comm_point_listen_for_rw(c, 0, 1); comm_point_listen_for_rw(c, 0, 1);
return 1; return 1;
} else if(want == SSL_ERROR_SYSCALL) { } else if(want == SSL_ERROR_SYSCALL) {
#ifdef ECONNRESET
if(errno == ECONNRESET && verbosity < 2)
return 0; /* silence reset by peer */
#endif
if(errno != 0) if(errno != 0)
log_err("SSL_read syscall: %s", log_err("SSL_read syscall: %s",
strerror(errno)); strerror(errno));
@ -1303,6 +1311,10 @@ ssl_handle_write(struct comm_point* c)
ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_WRITE); ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_WRITE);
return 1; /* write more later */ return 1; /* write more later */
} else if(want == SSL_ERROR_SYSCALL) { } else if(want == SSL_ERROR_SYSCALL) {
#ifdef EPIPE
if(errno == EPIPE && verbosity < 2)
return 0; /* silence 'broken pipe' */
#endif
if(errno != 0) if(errno != 0)
log_err("SSL_write syscall: %s", log_err("SSL_write syscall: %s",
strerror(errno)); strerror(errno));
@ -1337,6 +1349,10 @@ ssl_handle_write(struct comm_point* c)
ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_WRITE); ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_WRITE);
return 1; /* write more later */ return 1; /* write more later */
} else if(want == SSL_ERROR_SYSCALL) { } else if(want == SSL_ERROR_SYSCALL) {
#ifdef EPIPE
if(errno == EPIPE && verbosity < 2)
return 0; /* silence 'broken pipe' */
#endif
if(errno != 0) if(errno != 0)
log_err("SSL_write syscall: %s", log_err("SSL_write syscall: %s",
strerror(errno)); strerror(errno));
@ -1834,6 +1850,10 @@ ssl_http_read_more(struct comm_point* c)
comm_point_listen_for_rw(c, 0, 1); comm_point_listen_for_rw(c, 0, 1);
return 1; return 1;
} else if(want == SSL_ERROR_SYSCALL) { } else if(want == SSL_ERROR_SYSCALL) {
#ifdef ECONNRESET
if(errno == ECONNRESET && verbosity < 2)
return 0; /* silence reset by peer */
#endif
if(errno != 0) if(errno != 0)
log_err("SSL_read syscall: %s", log_err("SSL_read syscall: %s",
strerror(errno)); strerror(errno));
@ -2282,6 +2302,10 @@ ssl_http_write_more(struct comm_point* c)
} else if(want == SSL_ERROR_WANT_WRITE) { } else if(want == SSL_ERROR_WANT_WRITE) {
return 1; /* write more later */ return 1; /* write more later */
} else if(want == SSL_ERROR_SYSCALL) { } else if(want == SSL_ERROR_SYSCALL) {
#ifdef EPIPE
if(errno == EPIPE && verbosity < 2)
return 0; /* silence 'broken pipe' */
#endif
if(errno != 0) if(errno != 0)
log_err("SSL_write syscall: %s", log_err("SSL_write syscall: %s",
strerror(errno)); strerror(errno));