ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'ondrej/little-socket-fixes' into 'main'

Browse Source 
Various little fixes in the old socket code

See merge request isc-projects/bind9!4253
This commit is contained in:
Ondřej Surý
2020-10-08 07:02:15 +00:00
parent 442a45966a 96ac91a18a
commit 8c4cf5d2e5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/isc/unix/socket.c
View File

@@ -2018,7 +2018,6 @@ set_sndbuf(void) {
socklen_t len;
fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
#if defined(ISC_PLATFORM_HAVEIPV6)
if (fd == -1) {
switch (errno) {
case EPROTONOSUPPORT:
@@ -2033,7 +2032,6 @@ set_sndbuf(void) {
break;
}
}
#endif /* if defined(ISC_PLATFORM_HAVEIPV6) */
if (fd == -1) {
return;
}
@@ -2348,8 +2346,6 @@ again:
#endif /* IPV6_RECVPKTINFO */
#endif /* defined(USE_CMSG) */
set_ip_dontfrag(sock);
#if defined(SET_RCVBUF)
optlen = sizeof(size);
if (getsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, (void *)&size,
@@ -2416,6 +2412,8 @@ again:
#endif /* ifdef IP_RECVTOS */
#endif /* defined(USE_CMSG) || defined(SET_RCVBUF) || defined(SET_SNDBUF) */
set_ip_dontfrag(sock);
setup_done:
inc_stats(manager->stats, sock->statsindex[STATID_OPEN]);
if (sock->active == 0) {