Rename isc_net_getudpportrange() to isc_net_getportrange()

This better reflects the true nature of the function as we are reading
the ephemeral port range which is not related to UDP at all.

(cherry picked from commit 295139f8ca7054934ee455106385dff1905fcd01)

diff --git a/bin/named/server.c b/bin/named/server.c
index 3ea6f5d4058666da5d59769130f55bb443b5dbda..796b4cc97ee6b08710e302e3bf8cac169fbe405c 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8849,7 +8849,7 @@ load_configuration(const char *filename, named_server_t *server,
        if (usev4ports != NULL) {
                portset_fromconf(v4portset, usev4ports, true);
        } else {
-               isc_net_getudpportrange(AF_INET, &port_low, &port_high);
+               isc_net_getportrange(AF_INET, &port_low, &port_high);
                if (port_low == port_high) {
                        isc_portset_add(v4portset, port_low);
                } else {
@@ -8872,7 +8872,7 @@ load_configuration(const char *filename, named_server_t *server,
        if (usev6ports != NULL) {
                portset_fromconf(v6portset, usev6ports, true);
        } else {
-               isc_net_getudpportrange(AF_INET6, &port_low, &port_high);
+               isc_net_getportrange(AF_INET6, &port_low, &port_high);
                if (port_low == port_high) {
                        isc_portset_add(v6portset, port_low);
                } else {

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 150ca90045ca5b425ac01336ab1bfd063a32910f..a33693d51256edc6f4de815a7ed35357defd5ca8 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -771,12 +771,12 @@ set_source_ports(dns_dispatchmgr_t *manager) {
 
        result = isc_portset_create(gmctx, &v4portset);
        check_result(result, "isc_portset_create (v4)");
-       isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
+       isc_net_getportrange(AF_INET, &udpport_low, &udpport_high);
        isc_portset_addrange(v4portset, udpport_low, udpport_high);
 
        result = isc_portset_create(gmctx, &v6portset);
        check_result(result, "isc_portset_create (v6)");
-       isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
+       isc_net_getportrange(AF_INET6, &udpport_low, &udpport_high);
        isc_portset_addrange(v6portset, udpport_low, udpport_high);
 
        result = dns_dispatchmgr_setavailports(manager, v4portset, v6portset);

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index d6ade76584c3e0920673842f41118ee398be7023..3da295db3f83bf72849b2d42e120c62c2e09a020 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -2046,7 +2046,7 @@ set_source_ports(dns_dispatchmgr_t *manager) {
                fatal("isc_portset_create (v4) failed");
        }
 
-       isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
+       isc_net_getportrange(AF_INET, &udpport_low, &udpport_high);
 
        isc_portset_addrange(v4portset, udpport_low, udpport_high);
 
@@ -2054,7 +2054,7 @@ set_source_ports(dns_dispatchmgr_t *manager) {
        if (result != ISC_R_SUCCESS) {
                fatal("isc_portset_create (v6) failed");
        }
-       isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
+       isc_net_getportrange(AF_INET6, &udpport_low, &udpport_high);
 
        isc_portset_addrange(v6portset, udpport_low, udpport_high);
 

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 12c61a09bf5a53e4264b24de6db5fc9efbc1471c..5f9e5d0557adcd246fd8e08557fc6a3cae9e7bcc 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -146,14 +146,14 @@ setsourceports(isc_mem_t *mctx, dns_dispatchmgr_t *manager) {
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }
-       isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
+       isc_net_getportrange(AF_INET, &udpport_low, &udpport_high);
        isc_portset_addrange(v4portset, udpport_low, udpport_high);
 
        result = isc_portset_create(mctx, &v6portset);
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }
-       isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
+       isc_net_getportrange(AF_INET6, &udpport_low, &udpport_high);
        isc_portset_addrange(v6portset, udpport_low, udpport_high);
 
        result = dns_dispatchmgr_setavailports(manager, v4portset, v6portset);

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index a31ad8833ec579318b60f7e726c654e11adc8945..6113423659178a03a0036f697221b151cd835622 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -917,7 +917,7 @@ static void
 create_default_portset(isc_mem_t *mctx, int family, isc_portset_t **portsetp) {
        in_port_t low, high;
 
-       isc_net_getudpportrange(family, &low, &high);
+       isc_net_getportrange(family, &low, &high);
 
        isc_portset_create(mctx, portsetp);
        isc_portset_addrange(*portsetp, low, high);

diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index e29967b59c77c7cbfc3a457ea6a8e3b7da10c20f..4cd426964153357c366c64e8be1a7ecbb07140b0 100644 (file)
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -249,7 +249,7 @@ void
 isc_net_enableipv6(void);
 
 void
-isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high);
+isc_net_getportrange(int af, in_port_t *low, in_port_t *high);
 /*%<
  * Returns system's default range of ephemeral UDP ports, if defined.
  * If the range is not available or unknown, ISC_NET_PORTRANGELOW and

diff --git a/lib/isc/net.c b/lib/isc/net.c
index af951c0e29ef664f16ceb1fe558f11b1e767da58..42d86548d625cd641c5dd4dd8ae4eaa239dd51de 100644 (file)
--- a/lib/isc/net.c
+++ b/lib/isc/net.c
@@ -333,7 +333,7 @@ isc_net_probe_ipv6pktinfo(void) {
 #if defined(USE_SYSCTL_PORTRANGE)
 #if defined(HAVE_SYSCTLBYNAME)
 static isc_result_t
-getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
+getportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
        int port_low, port_high;
        size_t portlen;
        const char *sysctlname_lowport, *sysctlname_hiport;
@@ -366,7 +366,7 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
 }
 #else  /* !HAVE_SYSCTLBYNAME */
 static isc_result_t
-getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
+getportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
        int mib_lo4[4] = SYSCTL_V4PORTRANGE_LOW;
        int mib_hi4[4] = SYSCTL_V4PORTRANGE_HIGH;
        int mib_lo6[4] = SYSCTL_V6PORTRANGE_LOW;
@@ -408,17 +408,17 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
 #endif /* USE_SYSCTL_PORTRANGE */
 
 void
-isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) {
+isc_net_getportrange(int af, in_port_t *low, in_port_t *high) {
        int result = ISC_R_FAILURE;
-#if !defined(USE_SYSCTL_PORTRANGE) && defined(__linux)
+#if !defined(USE_SYSCTL_PORTRANGE) && defined(__linux__)
        FILE *fp;
-#endif /* if !defined(USE_SYSCTL_PORTRANGE) && defined(__linux) */
+#endif /* if !defined(USE_SYSCTL_PORTRANGE) && defined(__linux__) */
 
        REQUIRE(low != NULL && high != NULL);
 
 #if defined(USE_SYSCTL_PORTRANGE)
-       result = getudpportrange_sysctl(af, low, high);
-#elif defined(__linux)
+       result = getportrange_sysctl(af, low, high);
+#elif defined(__linux__)
 
        UNUSED(af);
 

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index 70471465c7cd38f534d7e2cc8fcb5a79ec80020a..3f3be464bb010db0717f4e5bdcc7285e09c7047b 100644 (file)
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -247,10 +247,10 @@ isc_netmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, isc_nm_t **netmgrp) {
        /*
         * Set the initial port range for IP_LOCAL_PORT_RANGE.
         */
-       isc_net_getudpportrange(AF_INET, &port_low, &port_high);
+       isc_net_getportrange(AF_INET, &port_low, &port_high);
        isc_netmgr_portrange(netmgr, AF_INET, port_low, port_high);
 
-       isc_net_getudpportrange(AF_INET6, &port_low, &port_high);
+       isc_net_getportrange(AF_INET6, &port_low, &port_high);
        isc_netmgr_portrange(netmgr, AF_INET6, port_low, port_high);
 }