2396. [bug] Don't set SO_REUSEADDR for randomized ports.

                        [RT #18336]
part 2

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index a33b19b073d325d46d7705af61891fefc4382319..efd24030b17fe409e6efaf34c2e811362612095a 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.221.2.19.2.46.4.1 2008/07/22 04:16:13 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.19.2.46.4.2 2008/07/23 23:16:25 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -2047,7 +2047,8 @@ send_tcp_connect(dig_query_t *query) {
        sockcount++;
        debug("sockcount=%d", sockcount);
        if (specified_source)
-               result = isc_socket_bind(query->sock, &bind_address, 1);
+               result = isc_socket_bind(query->sock, &bind_address,
+                                        ISC_SOCKET_REUSEADDRESS);
        else {
                if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) &&
                    have_ipv4)
@@ -2101,8 +2102,8 @@ send_udp(dig_query_t *query) {
                sockcount++;
                debug("sockcount=%d", sockcount);
                if (specified_source) {
-                       result = isc_socket_bind(query->sock,
-                                                &bind_address, 1);
+                       result = isc_socket_bind(query->sock, &bind_address,
+                                                ISC_SOCKET_REUSEADDRESS);
                } else {
                        isc_sockaddr_anyofpf(&bind_any,
                                        isc_sockaddr_pf(&query->sockaddr));

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 286948eca3756a09700700ecc2cb4156d82de833..e9c53ec8dd8064fd18e87aba99fa7218ec110607 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.28.2.9.2.13.4.1 2008/07/22 04:16:13 marka Exp $ */
+/* $Id: controlconf.c,v 1.28.2.9.2.13.4.2 2008/07/23 23:16:25 marka Exp $ */
 
 #include <config.h>
 
@@ -1106,8 +1106,8 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp,
                                           &listener->sock);
 
        if (result == ISC_R_SUCCESS)
-               result = isc_socket_bind(listener->sock,
-                                        &listener->address, 1);
+               result = isc_socket_bind(listener->sock, &listener->address,
+                                        ISC_SOCKET_REUSEADDRESS);
 
        if (result == ISC_R_SUCCESS)
                result = control_listen(listener);

diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index a764a8743814c9ad911b1a4fe010227b833e8732..524f47b3387f2fb41fb158694784384a8315ee28 100644 (file)
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.c,v 1.59.2.5.8.21.4.2 2008/07/23 07:28:11 tbox Exp $ */
+/* $Id: interfacemgr.c,v 1.59.2.5.8.21.4.3 2008/07/23 23:16:25 marka Exp $ */
 
 #include <config.h>
 
@@ -298,7 +298,8 @@ ns_interface_accepttcp(ns_interface_t *ifp) {
 #ifndef ISC_ALLOW_MAPPED
        isc_socket_ipv6only(ifp->tcpsocket, ISC_TRUE);
 #endif
-       result = isc_socket_bind(ifp->tcpsocket, &ifp->addr, 1);
+       result = isc_socket_bind(ifp->tcpsocket, &ifp->addr,
+                                ISC_SOCKET_REUSEADDRESS);
        if (result != ISC_R_SUCCESS) {
                isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR,
                                 "binding TCP socket: %s",

diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c
index 74f0e9518f8b1d656009c77966576b388d6febdc..7dcdad4d47bb15088416b05eaf6ce2cde63e1475 100644 (file)
--- a/bin/named/lwresd.c
+++ b/bin/named/lwresd.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.c,v 1.37.2.2.2.8.14.2 2008/07/23 07:28:11 tbox Exp $ */
+/* $Id: lwresd.c,v 1.37.2.2.2.8.14.3 2008/07/23 23:16:26 marka Exp $ */
 
 /*
  * Main program for the Lightweight Resolver Daemon.
@@ -569,7 +569,8 @@ listener_bind(ns_lwreslistener_t *listener, isc_sockaddr_t *address) {
                return (result);
        }
 
-       result = isc_socket_bind(sock, &listener->address, 1);
+       result = isc_socket_bind(sock, &listener->address,
+                                ISC_SOCKET_REUSEADDRESS);
        if (result != ISC_R_SUCCESS) {
                char socktext[ISC_SOCKADDR_FORMATSIZE];
                isc_sockaddr_format(&listener->address, socktext,

diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index f0c43a0738351f7d5255767649924f806f710d03..2278b720fc81106a336361c1cb87b4bef7a1b2b6 100644 (file)
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sock_test.c,v 1.47.12.7.4.2 2008/07/23 07:28:11 tbox Exp $ */
+/* $Id: sock_test.c,v 1.47.12.7.4.3 2008/07/23 23:16:26 marka Exp $ */
 
 #include <config.h>
 
@@ -321,7 +321,7 @@ main(int argc, char *argv[]) {
        }
        RUNTIME_CHECK(isc_socket_create(socketmgr, pf, isc_sockettype_tcp,
                                        &so1) == ISC_R_SUCCESS);
-       result = isc_socket_bind(so1, &sockaddr, 1);
+       result = isc_socket_bind(so1, &sockaddr, ISC_SOCKET_REUSEADDRESS);
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
        RUNTIME_CHECK(isc_socket_listen(so1, 0) == ISC_R_SUCCESS);
 

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 6fb5177a69d625587e038432718e6c6d51d46f93..02a2f188d08cea52b10b8b0898fa1e0647e98063 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.101.2.6.2.21.4.4 2008/07/23 07:28:11 tbox Exp $ */
+/* $Id: dispatch.c,v 1.101.2.6.2.21.4.5 2008/07/23 23:16:26 marka Exp $ */
 
 #include <config.h>
 
@@ -1186,7 +1186,7 @@ destroy_mgr(dns_dispatchmgr_t **mgrp) {
 
 static isc_result_t
 create_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local,
-             int reuseaddr, isc_socket_t **sockp)
+             unsigned int options, isc_socket_t **sockp)
 {
        isc_socket_t *sock;
        isc_result_t result;
@@ -1200,7 +1200,7 @@ create_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local,
 #ifndef ISC_ALLOW_MAPPED
        isc_socket_ipv6only(sock, ISC_TRUE);
 #endif
-       result = isc_socket_bind(sock, local, reuseaddr);
+       result = isc_socket_bind(sock, local, options);
        if (result != ISC_R_SUCCESS) {
                isc_socket_detach(&sock);
                return (result);
@@ -1940,7 +1940,8 @@ dispatch_createudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr,
                }
                localport = prt;
        } else
-               result = create_socket(sockmgr, localaddr, 1, &sock);
+               result = create_socket(sockmgr, localaddr,
+                                      ISC_SOCKET_REUSEADDRESS, &sock);
        if (result != ISC_R_SUCCESS)
                goto deallocate_dispatch;
        if ((attributes & DNS_DISPATCHATTR_RANDOMPORT) == 0 &&

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 1953f3777c22aa01e4d501a93dbc18113c00e46b..ecd31c4fe8023abf92b46bf90db80606a4548bfd 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.4.2.21.4.2 2008/07/23 07:28:11 tbox Exp $ */
+/* $Id: xfrin.c,v 1.124.2.4.2.21.4.3 2008/07/23 23:16:26 marka Exp $ */
 
 #include <config.h>
 
@@ -857,7 +857,8 @@ xfrin_start(dns_xfrin_ctx_t *xfr) {
                                isc_sockettype_tcp,
                                &xfr->socket));
 #ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
-       CHECK(isc_socket_bind(xfr->socket, &xfr->sourceaddr, 1));
+       CHECK(isc_socket_bind(xfr->socket, &xfr->sourceaddr,
+                             ISC_SOCKET_REUSEADDRESS));
 #endif
        CHECK(isc_socket_connect(xfr->socket, &xfr->masteraddr, xfr->task,
                                 xfrin_connect_done, xfr));

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 4fbff59df894859f5e85958bfaff35cbb01cb09d..0537a0d6693bf62e5dfa75fe46ab00dad17ffcc8 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.h,v 1.54.12.7.4.3 2008/07/23 12:03:53 marka Exp $ */
+/* $Id: socket.h,v 1.54.12.7.4.4 2008/07/23 23:16:27 marka Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
@@ -81,6 +81,12 @@ ISC_LANG_BEGINDECLS
  */
 #define ISC_SOCKET_MAXSCATTERGATHER    8
 
+/*%
+ * In isc_socket_bind() set socket option SO_REUSEADDR prior to calling
+ * bind() if a non zero port is specified (AF_INET and AF_INET6).
+ */
+#define ISC_SOCKET_REUSEADDRESS                0x01U
+
 /***
  *** Types
  ***/
@@ -306,7 +312,8 @@ isc_socket_detach(isc_socket_t **socketp);
  */
 
 isc_result_t
-isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *addressp, int reuseaddr);
+isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *addressp,
+               unsigned int reuseaddr);
 /*
  * Bind 'socket' to '*addressp'.
  *
@@ -351,8 +358,6 @@ isc_socket_listen(isc_socket_t *sock, unsigned int backlog);
  *
  *     'socket' is a valid, bound TCP socket.
  *
- * \li 'reuseaddr' asks to set SO_REUSEADDR (if the port is not 0).
-
  * Returns:
  *
  *     ISC_R_SUCCESS

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index f8c54ee9bf89b424c4cfa098e5edc3e58671a777..5a9e9da0ac73fa3c9a2f76f95a20fe82857f7411 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.19.2.35.4.2 2008/07/23 12:03:53 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.35.4.3 2008/07/23 23:16:27 marka Exp $ */
 
 #include <config.h>
 
@@ -2967,7 +2967,8 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region,
 }
 
 isc_result_t
-isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, int reuseaddr) {
+isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, 
+               unsigned int options) {
        char strbuf[ISC_STRERRORSIZE];
        int on = 1;
 
@@ -2982,7 +2983,7 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, int reuseaddr) {
        /*
         * Only set SO_REUSEADDR when we want a specific port.
         */
-       if (reuseaddr &&
+       if ((options & ISC_SOCKET_REUSEADDRESS) != 0 &&
            isc_sockaddr_getport(sockaddr) != (in_port_t)0 &&
            setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
                       sizeof(on)) < 0) {

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index fd1fc34ef320bcf7a28270d6b9243d7b47a7a70a..3df1bfe0fb185b99a255beaf345886d70970638a 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.5.2.13.2.24.4.3 2008/07/23 12:03:53 marka Exp $ */
+/* $Id: socket.c,v 1.5.2.13.2.24.4.4 2008/07/23 23:16:27 marka Exp $ */
 
 /* This code has been rewritten to take advantage of Windows Sockets
  * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -3257,7 +3257,8 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region,
 }
 
 isc_result_t
-isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, int reuseaddr) {
+isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr,
+               unsigned int options) {
        int bind_errno;
        char strbuf[ISC_STRERRORSIZE];
        int on = 1;
@@ -3273,7 +3274,7 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, int reuseaddr) {
        /*
         * Only set SO_REUSEADDR when we want a specific port.
         */
-       if (reuseaddr &&
+       if ((options & ISC_SOCKET_REUSEADDRESS) != 0 &&
            isc_sockaddr_getport(sockaddr) != (in_port_t)0 &&
            setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
                       sizeof(on)) < 0) {