mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

3225. [bug] Silence spurious "setsockopt(517, IPV6_V6ONLY) failed"

Browse Source 
messages. [RT #26507]
This commit is contained in:
Mark Andrews
2011-11-29 01:03:47 +00:00
parent 9bd876a683
commit 23daf8948b
5 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3225. [bug] Silence spurious "setsockopt(517, IPV6_V6ONLY) failed"
messages. [RT #26507]
3224. [bug] 'rndc signing' argument parsing was broken. [RT #26684] 3224. [bug] 'rndc signing' argument parsing was broken. [RT #26684]
3223. [bug] 'task_test privilege_drop' generated false positives. 3223. [bug] 'task_test privilege_drop' generated false positives.

6
lib/dns/dispatch.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dispatch.c,v 1.174 2011/07/28 23:47:58 tbox Exp $ */ /* $Id: dispatch.c,v 1.175 2011/11/29 01:03:47 marka Exp $ */
/*! \file */ /*! \file */
@@ -1810,6 +1810,10 @@ open_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local,
result = isc_socket_dup(dup_socket, &sock); result = isc_socket_dup(dup_socket, &sock);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
isc_socket_setname(sock, "dispatcher", NULL);
*sockp = sock;
return (ISC_R_SUCCESS);
} else { } else {
result = isc_socket_create(mgr, isc_sockaddr_pf(local), result = isc_socket_create(mgr, isc_sockaddr_pf(local),
isc_sockettype_udp, &sock); isc_sockettype_udp, &sock);

9
lib/isc/tests/socket_test.c
View File

@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket_test.c,v 1.4 2011/09/02 21:15:38 each Exp $ */ /* $Id: socket_test.c,v 1.5 2011/11/29 01:03:47 marka Exp $ */
/*! \file */ /*! \file */
@@ -181,12 +181,10 @@ ATF_TC_BODY(udp_dup, tc) {
result = isc_socket_create(socketmgr, PF_INET, isc_sockettype_udp, &s2); result = isc_socket_create(socketmgr, PF_INET, isc_sockettype_udp, &s2);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_socket_dup(s2, &s3);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_socket_bind(s2, &addr2, ISC_SOCKET_REUSEADDRESS); result = isc_socket_bind(s2, &addr2, ISC_SOCKET_REUSEADDRESS);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_socket_bind(s3, &addr2, ISC_SOCKET_REUSEADDRESS);
result = isc_socket_dup(s2, &s3);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_task_create(taskmgr, 0, &task); result = isc_task_create(taskmgr, 0, &task);
@@ -245,7 +243,6 @@ ATF_TC_BODY(udp_dup, tc) {
isc_test_end(); isc_test_end();
} }
/* /*
* Main * Main
*/ */

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

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.348 2011/08/25 11:37:13 marka Exp $ */ /* $Id: socket.c,v 1.349 2011/11/29 01:03:47 marka Exp $ */
/*! \file */ /*! \file */
@@ -2270,6 +2270,7 @@ opensocket(isc__socketmgr_t *manager, isc__socket_t *sock,
} else { } else {
sock->fd = dup(dup_socket->fd); sock->fd = dup(dup_socket->fd);
sock->dupped = 1; sock->dupped = 1;
sock->bound = dup_socket->bound;
} }
if (sock->fd == -1 && errno == EINTR && tries++ < 42) if (sock->fd == -1 && errno == EINTR && tries++ < 42)
goto again; goto again;
@@ -5028,12 +5029,13 @@ isc__socket_bind(isc_socket_t *sock0, isc_sockaddr_t *sockaddr,
LOCK(&sock->lock); LOCK(&sock->lock);
INSIST(!sock->bound); INSIST(!sock->bound);
INSIST(!sock->dupped);
if (sock->pf != sockaddr->type.sa.sa_family) { if (sock->pf != sockaddr->type.sa.sa_family) {
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
return (ISC_R_FAMILYMISMATCH); return (ISC_R_FAMILYMISMATCH);
} }
if (!sock->dupped) {
/* /*
* Only set SO_REUSEADDR when we want a specific port. * Only set SO_REUSEADDR when we want a specific port.
*/ */
@@ -5075,7 +5077,7 @@ isc__socket_bind(isc_socket_t *sock0, isc_sockaddr_t *sockaddr,
return (ISC_R_UNEXPECTED); return (ISC_R_UNEXPECTED);
} }
} }
}
socket_log(sock, sockaddr, TRACE, socket_log(sock, sockaddr, TRACE,
isc_msgcat, ISC_MSGSET_SOCKET, ISC_MSG_BOUND, "bound"); isc_msgcat, ISC_MSGSET_SOCKET, ISC_MSG_BOUND, "bound");
sock->bound = 1; sock->bound = 1;
@@ -5718,6 +5720,7 @@ isc__socket_ipv6only(isc_socket_t *sock0, isc_boolean_t yes) {
#endif #endif
REQUIRE(VALID_SOCKET(sock)); REQUIRE(VALID_SOCKET(sock));
INSIST(!sock->dupped);
#ifdef IPV6_V6ONLY #ifdef IPV6_V6ONLY
if (sock->pf == AF_INET6) { if (sock->pf == AF_INET6) {

4
lib/isc/win32/socket.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.92 2011/08/23 18:24:33 each Exp $ */ /* $Id: socket.c,v 1.93 2011/11/29 01:03:47 marka Exp $ */
/* This code uses functions which are only available on Server 2003 and /* This code uses functions which are only available on Server 2003 and
* higher, and Windows XP and higher. * higher, and Windows XP and higher.
@@ -1688,6 +1688,7 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
*/ */
sock->fd = _dup(dup_socket->fd); sock->fd = _dup(dup_socket->fd);
sock->dupped = 1; sock->dupped = 1;
sock->bound = dup_socket->bound;
} }
if (sock->fd == INVALID_SOCKET) { if (sock->fd == INVALID_SOCKET) {
@@ -3175,6 +3176,7 @@ isc__socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr,
} }
INSIST(!sock->bound); INSIST(!sock->bound);
INSIST(!sock->dupped);
if (sock->pf != sockaddr->type.sa.sa_family) { if (sock->pf != sockaddr->type.sa.sa_family) {
UNLOCK(&sock->lock); UNLOCK(&sock->lock);