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

- If MSG_FASTOPEN gives EPIPE fallthrough to try normal tcp write.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4201 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-05-31 11:09:15 +00:00
parent e4c60435d2
commit 627299f5e4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,5 +1,6 @@
31 May 2017: Wouter 31 May 2017: Wouter
- Fix #1273: cachedb.c doesn't compile with -Wextra. - Fix #1273: cachedb.c doesn't compile with -Wextra.
- If MSG_FASTOPEN gives EPIPE fallthrough to try normal tcp write.
30 May 2017: Ralph 30 May 2017: Ralph
- Fix #1269: inconsistent use of built-in local zones with views. - Fix #1269: inconsistent use of built-in local zones with views.

9
util/netevent.c
View file

@ -1407,12 +1407,15 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
if(errno == EINTR || errno == EAGAIN) if(errno == EINTR || errno == EAGAIN)
return 1; return 1;
/* Not handling EISCONN here as shouldn't ever hit that case.*/ /* Not handling EISCONN here as shouldn't ever hit that case.*/
if(errno != 0 && verbosity < 2) if(errno != EPIPE && errno != 0 && verbosity < 2)
return 0; /* silence lots of chatter in the logs */ return 0; /* silence lots of chatter in the logs */
else if(errno != 0) if(errno != EPIPE && errno != 0) {
log_err_addr("tcp sendmsg", strerror(errno), log_err_addr("tcp sendmsg", strerror(errno),
&c->repinfo.addr, c->repinfo.addrlen); &c->repinfo.addr, c->repinfo.addrlen);
return 0; return 0;
}
/* fallthrough to nonFASTOPEN
* (MSG_FASTOPEN on Linux 3 produces EPIPE) */
} else { } else {
c->tcp_byte_count += r; c->tcp_byte_count += r;
if(c->tcp_byte_count < sizeof(uint16_t)) if(c->tcp_byte_count < sizeof(uint16_t))