mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00
Code Issues Releases Wiki Activity

1681. [bug] Only set SO_REUSEADDR when a port is specified in

Browse Source 
isc_socket_bind(). [RT #11742]
This commit is contained in:
Mark Andrews
2004-06-30 23:35:17 +00:00
parent 85609ef4d7
commit 9aa7706900
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,7 @@
1682. [placeholder] rt5066a 1682. [placeholder] rt5066a
1681. [placeholder] rt11742 1681. [bug] Only set SO_REUSEADDR when a port is specified in
isc_socket_bind(). [RT #11742]
1680. [placeholder] rt11697 1680. [placeholder] rt11697

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

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.239 2004/04/19 02:53:05 marka Exp $ */ /* $Id: socket.c,v 1.240 2004/06/30 23:35:16 marka Exp $ */
#include <config.h> #include <config.h>
@@ -2859,8 +2859,12 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr) {
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
return (ISC_R_FAMILYMISMATCH); return (ISC_R_FAMILYMISMATCH);
} }
if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, /*
sizeof(on)) < 0) { * Only set SO_REUSEADDR when we want a specific port.
*/
if (isc_sockaddr_getport(sockaddr) != (in_port_t)0 &&
setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
sizeof(on)) < 0) {
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d) %s", sock->fd, "setsockopt(%d) %s", sock->fd,
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL, isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,

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

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.33 2004/06/18 01:14:59 marka Exp $ */ /* $Id: socket.c,v 1.34 2004/06/30 23:35:17 marka Exp $ */
/* This code has been rewritten to take advantage of Windows Sockets /* This code has been rewritten to take advantage of Windows Sockets
* I/O Completion Ports and Events. I/O Completion Ports is ONLY * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -3225,7 +3225,11 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr) {
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
return (ISC_R_FAMILYMISMATCH); return (ISC_R_FAMILYMISMATCH);
} }
if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, /*
* Only set SO_REUSEADDR when we want a specific port.
*/
if (isc_sockaddr_getport(sockaddr) != (in_port_t)0 &&
setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
sizeof(on)) < 0) { sizeof(on)) < 0) {
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d) %s", sock->fd, "setsockopt(%d) %s", sock->fd,