Adjust system forward test to also use IPv6 addresses

The ns3->ns2 forwarding is now done using the IPv6 addresses, so we also
test that the query-source-v6 address is still operational after removal
of interface adjustment.

(cherry picked from commit 8a4c44ca24124b661666ce82358152c09afbd31e)

diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in
index 28d1b33785dcd9ba622308577de0b2590c76c3c7..4aef4e55e5ac0909bb7ee85d3f59a835598237a5 100644 (file)
--- a/bin/tests/system/forward/ns1/named.conf.in
+++ b/bin/tests/system/forward/ns1/named.conf.in
@@ -11,12 +11,15 @@
 
 options {
        query-source address 10.53.0.1;
+       query-source-v6 address fd92:7065:b8e:ffff::1;
        notify-source 10.53.0.1;
+       notify-source-v6 fd92:7065:b8e:ffff::1;
        transfer-source 10.53.0.1;
+       transfer-source-v6 fd92:7065:b8e:ffff::1;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       listen-on-v6 { fd92:7065:b8e:ffff::1; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in
index f7256abb14b354e1455e6b3a2084929e9399decc..31e5f05546af0e8fa1450cbd773c36842ffd45c3 100644 (file)
--- a/bin/tests/system/forward/ns2/named.conf.in
+++ b/bin/tests/system/forward/ns2/named.conf.in
@@ -11,12 +11,15 @@
 
 options {
        query-source address 10.53.0.2;
+       query-source-v6 address fd92:7065:b8e:ffff::2;
        notify-source 10.53.0.2;
+       notify-source-v6 fd92:7065:b8e:ffff::2;
        transfer-source 10.53.0.2;
+       transfer-source-v6 fd92:7065:b8e:ffff::2;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       listen-on-v6 { fd92:7065:b8e:ffff::2; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/forward/ns3/named1.conf.in b/bin/tests/system/forward/ns3/named1.conf.in
index 326befd99bfe508fa5c68a5d1b51a2a4df33847c..da0979f29e1127da9794cb1ac35ebf3c66cbe3c0 100644 (file)
--- a/bin/tests/system/forward/ns3/named1.conf.in
+++ b/bin/tests/system/forward/ns3/named1.conf.in
@@ -11,13 +11,16 @@
 
 options {
        query-source address 10.53.0.3;
+       query-source-v6 address fd92:7065:b8e:ffff::3;
        notify-source 10.53.0.3;
+       notify-source-v6 fd92:7065:b8e:ffff::3;
        transfer-source 10.53.0.3;
+       transfer-source-v6 fd92:7065:b8e:ffff::3;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
-       forwarders { 10.53.0.2; };
+       listen-on-v6 { fd92:7065:b8e:ffff::3; };
+       forwarders { fd92:7065:b8e:ffff::2; };
        forward first;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/forward/ns3/named2.conf.in b/bin/tests/system/forward/ns3/named2.conf.in
index cf45ea62a9cf64e66313085c237b23e400466ff8..4eb98edcb5a9fd45e8eed0e2bd21d2c8588d5dda 100644 (file)
--- a/bin/tests/system/forward/ns3/named2.conf.in
+++ b/bin/tests/system/forward/ns3/named2.conf.in
@@ -11,12 +11,15 @@
 
 options {
        query-source address 10.53.0.3;
+       query-source-v6 address fd92:7065:b8e:ffff::3;
        notify-source 10.53.0.3;
+       notify-source-v6 fd92:7065:b8e:ffff::3;
        transfer-source 10.53.0.3;
+       transfer-source-v6 fd92:7065:b8e:ffff::3;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       listen-on-v6 { fd92:7065:b8e:ffff::3; };
        forwarders { 10.53.0.6; };
        dnssec-validation yes;
 };

diff --git a/lib/ns/win32/libns.def b/lib/ns/win32/libns.def
index 1680e4982d68a81351cb5efd4efe372bfdc71da9..eadd940a9ce1c2a2dad1aaba7dbd0dc7a5a0ab63 100644 (file)
--- a/lib/ns/win32/libns.def
+++ b/lib/ns/win32/libns.def
@@ -49,7 +49,6 @@ ns_hooktable_init
 ns_interface_attach
 ns_interface_detach
 ns_interface_shutdown
-ns_interfacemgr_adjust
 ns_interfacemgr_attach
 ns_interfacemgr_create
 ns_interfacemgr_detach