Make mdig use the OS-supplied ephemeral port range

mdig was always using the default 1024-65535 range for outgoing
messages, instead of using the system's configured ephemeral ports.

(cherry picked from commit 0fecb10c172fad66a698d3737958439e28d96113)

diff --git a/CHANGES b/CHANGES
index 15a3fc3b3359600aa4c6c4571edc1f0b288e8460..b515170b3b4f57601ea9fdc64734f56057e58862 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5758.  [bug]           mdig now honors the operating system's preferred
+                       ephemeral port range. [GL #2374]
+
 5757.  [test]          Replace sed in nsupdate system test with awk to
                        construct the nsupdate command.  The sed expression
                        was not reliably changing the ttl. [GL #3003]

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 6b36743a7a24719655ba12bad86fcd7875564702..b5885e5f8f2b6b73c4449e43ee0776b041c987b9 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -25,6 +25,7 @@
 #include <isc/net.h>
 #include <isc/nonce.h>
 #include <isc/parseint.h>
+#include <isc/portset.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/sockaddr.h>
@@ -2057,6 +2058,47 @@ parse_args(bool is_batchfile, int argc, char **argv) {
        }
 }
 
+/*
+ * Try honoring the operating system's preferred ephemeral port range.
+ */
+static void
+set_source_ports(dns_dispatchmgr_t *manager) {
+       isc_portset_t *v4portset = NULL, *v6portset = NULL;
+       in_port_t udpport_low, udpport_high;
+       isc_result_t result;
+
+       result = isc_portset_create(mctx, &v4portset);
+       if (result != ISC_R_SUCCESS) {
+               fatal("isc_portset_create (v4) failed");
+       }
+
+       result = isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
+       if (result != ISC_R_SUCCESS) {
+               fatal("isc_net_getudpportrange (v4) failed");
+       }
+
+       isc_portset_addrange(v4portset, udpport_low, udpport_high);
+
+       result = isc_portset_create(mctx, &v6portset);
+       if (result != ISC_R_SUCCESS) {
+               fatal("isc_portset_create (v6) failed");
+       }
+       result = isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
+       if (result != ISC_R_SUCCESS) {
+               fatal("isc_net_getudpportrange (v6) failed");
+       }
+
+       isc_portset_addrange(v6portset, udpport_low, udpport_high);
+
+       result = dns_dispatchmgr_setavailports(manager, v4portset, v6portset);
+       if (result != ISC_R_SUCCESS) {
+               fatal("dns_dispatchmgr_setavailports failed");
+       }
+
+       isc_portset_destroy(mctx, &v4portset);
+       isc_portset_destroy(mctx, &v6portset);
+}
+
 /*% Main processing routine for mdig */
 int
 main(int argc, char *argv[]) {
@@ -2126,12 +2168,14 @@ main(int argc, char *argv[]) {
 
        RUNCHECK(isc_managers_create(mctx, 1, 0, &netmgr, &taskmgr));
        RUNCHECK(isc_task_create(taskmgr, 0, &task));
-
        RUNCHECK(isc_timermgr_create(mctx, &timermgr));
        RUNCHECK(isc_socketmgr_create(mctx, &socketmgr));
        RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr));
 
+       set_source_ports(dispatchmgr);
+
        attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY;
+
        if (have_ipv4) {
                isc_sockaddr_any(&bind_any);
                attrs |= DNS_DISPATCHATTR_IPV4;