[#3851] changes 4o6 port in examples and doc

diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json
index f11b5c6eb9b396dbfe6972de7ea875d1fc06813b..91d6164f56ddc3ea7369710884d54289d4ee28c9 100644 (file)
--- a/doc/examples/kea4/all-keys-netconf.json
+++ b/doc/examples/kea4/all-keys-netconf.json
@@ -279,8 +279,9 @@
 
         // Specifies the first of the two consecutive ports of the UDP
         // sockets used for communication between DHCPv6 and DHCPv4
-        // servers. See RFC 7341.
-        "dhcp4o6-port": 6767,
+        // servers. See RFC 7341. (defaults to 0 - disabled).
+        // If enabled, use e.g. 786.
+        "dhcp4o6-port": 0,
 
         // Boolean flag indicating whether the Kea DHCPv4 server
         // should send back the Client Identifier option in its responses.

diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json
index 53079ea04819debdb8f6f04407d235eb89e2a0f4..ad2f451f47747627d2a2c34282a5a5de31b0e19b 100644 (file)
--- a/doc/examples/kea4/all-keys.json
+++ b/doc/examples/kea4/all-keys.json
@@ -401,8 +401,9 @@
 
         // Specifies the first of the two consecutive ports of the UDP
         // sockets used for communication between DHCPv6 and DHCPv4
-        // servers. See RFC 7341.
-        "dhcp4o6-port": 6767,
+        // servers. See RFC 7341. (defaults to 0 - disabled).
+        // If enabled, use e.g. 786.
+        "dhcp4o6-port": 0,
 
         // Boolean flag indicating whether the Kea DHCPv4 server
         // should send back the Client Identifier option in its responses.

diff --git a/doc/examples/kea4/dhcpv4-over-dhcpv6.json b/doc/examples/kea4/dhcpv4-over-dhcpv6.json
index ff338470d8a582143d7d809dfee2a1a43cfc2876..27e9d509bac6ea323fb78f76adfe3545c4149112 100644 (file)
--- a/doc/examples/kea4/dhcpv4-over-dhcpv6.json
+++ b/doc/examples/kea4/dhcpv4-over-dhcpv6.json
@@ -29,7 +29,7 @@
   ],
 
 // This enables DHCPv4-over-DHCPv6 support
-  "dhcp4o6-port": 6767,
+  "dhcp4o6-port": 786,
 
   "loggers": [
     {

diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json
index 82f5e20574a7c2128756d02e228dc4c4904f473b..f78ba78680827e9dd57126e914bfc746da1aee2e 100644 (file)
--- a/doc/examples/kea6/all-keys-netconf.json
+++ b/doc/examples/kea6/all-keys-netconf.json
@@ -230,7 +230,8 @@
 
         // Specifies the first of the two consecutive ports of the UDP
         // sockets used for communication between DHCPv6 and DHCPv4
-        // servers. See RFC 7341.
+        // servers. See RFC 7341. (defaults to 0 - disabled).
+        // If enabled, use e.g. 786.
         "dhcp4o6-port": 0,
 
         // Collection of Kea DHCPv6 server parameters configuring how

diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json
index f5c560021b0505ec41cb2ff18423488370d5da36..787f0361c1563a44d81b63876b0d4256d2424cab 100644 (file)
--- a/doc/examples/kea6/all-keys.json
+++ b/doc/examples/kea6/all-keys.json
@@ -352,7 +352,8 @@
 
         // Specifies the first of the two consecutive ports of the UDP
         // sockets used for communication between DHCPv6 and DHCPv4
-        // servers. See RFC 7341.
+        // servers. See RFC 7341. (defaults to 0 - disabled).
+        // If enabled, use e.g. 786.
         "dhcp4o6-port": 0,
 
         // Collection of Kea DHCPv6 server parameters configuring how

diff --git a/doc/examples/kea6/dhcpv4-over-dhcpv6.json b/doc/examples/kea6/dhcpv4-over-dhcpv6.json
index 698fc9648129ab1b2e440742399e3fcb2e37a45c..91bb0c68722df6eaf9c1a62cc3008848c35654d1 100644 (file)
--- a/doc/examples/kea6/dhcpv4-over-dhcpv6.json
+++ b/doc/examples/kea6/dhcpv4-over-dhcpv6.json
@@ -29,7 +29,7 @@
   ],
 
 // This enables DHCPv4-over-DHCPv6 support
-  "dhcp4o6-port": 6767,
+  "dhcp4o6-port": 786,
 
 // Required by DHCPv4-over-DHCPv6 clients
   "option-data": [

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index a1d47ef3fbf5568a72dffd510fbfd01c5aeec8d3..48dd998958698206277913062daf002e026423d1 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -4479,7 +4479,7 @@ ISC tested the following configuration:
        }
        ],
 
-       "dhcp4o6-port": 6767,
+       "dhcp4o6-port": 786,
 
        "loggers": [
        {

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 13f28cc450c3ebe314c91490153eb3e926d257da..eaff411e465f7a474dfc469d5467e78362b4fb9e 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -3917,7 +3917,7 @@ ISC tested the following configuration:
            "pools": [ { "pool": "2001:db8:1:1::1:0/112" } ]
        } ],
 
-       "dhcp4o6-port": 6767,
+       "dhcp4o6-port": 786,
 
        "option-data": [ {
            "name": "dhcp4o6-server-addr",