Browse Source

[3464] DHCPv4 chapter in ARM updated.

Tomek Mrugalski 10 years ago
parent
commit
b072144c2a
1 changed files with 25 additions and 16 deletions
  1. 25 16
      doc/guide/dhcp4-srv.xml

+ 25 - 16
doc/guide/dhcp4-srv.xml

@@ -90,7 +90,9 @@
     "subnet4": [
     "subnet4": [
         {
         {
             "subnet": "192.0.2.0/24",
             "subnet": "192.0.2.0/24",
-            "pool": [ "192.0.2.1 - 192.0.2.200" ]
+            "pools": [
+                { "pool": "192.0.2.1 - 192.0.2.200" }
+            ]
         }
         }
     ]
     ]
 
 
@@ -176,8 +178,8 @@ so it starts and ends with square brackets.  Each subnet definition in
 the list has several attributes associated with it, so is a structure
 the list has several attributes associated with it, so is a structure
 and is opened and closed with braces. At minimum, a subnet definition
 and is opened and closed with braces. At minimum, a subnet definition
 has to have at least two parameters: <command>subnet</command> (that
 has to have at least two parameters: <command>subnet</command> (that
-defines the whole subnet) and <command>pool</command> (which is a list of
+defines the whole subnet) and <command>pools</command> (which is a list of
-dynamically allocated pools that are governed by the DHCP server.</para>
+dynamically allocated pools that are governed by the DHCP server).</para>
 
 
 <para>The example contains a single subnet. Had more than one been defined,
 <para>The example contains a single subnet. Had more than one been defined,
 additional elements
 additional elements
@@ -187,15 +189,15 @@ syntax would be used:
 <screen>
 <screen>
 "subnet4": [
 "subnet4": [
     {
     {
-        "pool": [ "192.0.2.1 - 192.0.2.200" ],
+        "pools": [ { "pool":  "192.0.2.1 - 192.0.2.200" } ],
         "subnet": "192.0.2.0/24"
         "subnet": "192.0.2.0/24"
     },
     },
     {
     {
-        "pool": [ "192.0.3.100 - 192.0.3.200" ],
+        "pools": [ { "pool": "192.0.3.100 - 192.0.3.200" } ],
         "subnet": "192.0.3.0/24"
         "subnet": "192.0.3.0/24"
     },
     },
     {
     {
-        "pool": [ "192.0.4.1 - 192.0.4.254" ],
+        "pool": [ { "pool": "192.0.4.1 - 192.0.4.254" } ],
         "subnet": "192.0.4.0/24"
         "subnet": "192.0.4.0/24"
     }
     }
 ]
 ]
@@ -385,12 +387,16 @@ temporarily override a list of interface names and listen on all interfaces.
 "Dhcp4": {
 "Dhcp4": {
     <userinput>"subnet4": [
     <userinput>"subnet4": [
         "subnet": "192.0.2.0/24",
         "subnet": "192.0.2.0/24",
-        "pool": [ "192.0.2.10 - 192.0.2.20" ]</userinput>,
+        "pools": [
+	    {
+	        "pool": "192.0.2.10 - 192.0.2.20"
+            }
+        ]</userinput>,
         ...
         ...
     ]
     ]
 }</screen>
 }</screen>
 
 
-    Note that subnet is defined as a simple string, but the pool parameter is
+    Note that subnet is defined as a simple string, but the 'pools' parameter is
     actually a list of pools: for this reason, the pool definition is enclosed
     actually a list of pools: for this reason, the pool definition is enclosed
     in square brackets, even though only one range of addresses is
     in square brackets, even though only one range of addresses is
     specified in this example.</para>
     specified in this example.</para>
@@ -404,7 +410,10 @@ temporarily override a list of interface names and listen on all interfaces.
 <screen>
 <screen>
 "Dhcp4": {
 "Dhcp4": {
     "subnet4": [
     "subnet4": [
-        <userinput>"pool": [ "192.0.2.10-192.0.2.20", "192.0.2.64/26" ]</userinput>,
+        <userinput>"pools": [
+            { "pool": "192.0.2.10-192.0.2.20" },
+            { "pool": "192.0.2.64/26" }
+        ]</userinput>,
         ...
         ...
     ],
     ],
     ...
     ...
@@ -421,17 +430,17 @@ temporarily override a list of interface names and listen on all interfaces.
     "subnet4": [
     "subnet4": [
         {
         {
             "subnet": "192.0.2.0/24",
             "subnet": "192.0.2.0/24",
-            "pool": [ "192.0.2.1 - 192.0.2.200" ],
+            "pools": [ { "pool": "192.0.2.1 - 192.0.2.200" } ],
             ...
             ...
         },
         },
         {
         {
             "subnet": "192.0.3.0/24",
             "subnet": "192.0.3.0/24",
-            "pool": [ "192.0.3.100 - 192.0.3.200" ],
+            "pools": [ { "pool": "192.0.3.100 - 192.0.3.200" } ],
             ...
             ...
         },
         },
         {
         {
             "subnet": "192.0.4.0/24",
             "subnet": "192.0.4.0/24",
-            "pool": [ "192.0.4.1 - 192.0.4.254" ],
+            "pools": [ { "pool": "192.0.4.1 - 192.0.4.254" } ],
             ...
             ...
         }
         }
     ]
     ]
@@ -1188,7 +1197,7 @@ temporarily override a list of interface names and listen on all interfaces.
     "subnet4": [
     "subnet4": [
         {
         {
             <userinput>subnet: "192.0.2.0/24",
             <userinput>subnet: "192.0.2.0/24",
-            "pool": [ "192.0.2.10 - 192.0.2.20" ],
+            "pools": [ { "pool": "192.0.2.10 - 192.0.2.20" } ],
             "client-class": "VENDOR_CLASS_docsis3.0"</userinput>
             "client-class": "VENDOR_CLASS_docsis3.0"</userinput>
         }
         }
     ],
     ],
@@ -1696,7 +1705,7 @@ temporarily override a list of interface names and listen on all interfaces.
     "subnet4: [
     "subnet4: [
         {
         {
             "subnet": "192.0.2.0/24",
             "subnet": "192.0.2.0/24",
-            "pool": [ "192.0.2.10 - 192.0.2.20" ],
+            "pools": [ { "pool": "192.0.2.10 - 192.0.2.20" } ],
             <userinput>"relay": {
             <userinput>"relay": {
                 "ip-address": "10.0.0.1"
                 "ip-address": "10.0.0.1"
             }</userinput>,
             }</userinput>,
@@ -1732,7 +1741,7 @@ temporarily override a list of interface names and listen on all interfaces.
     "subnet4: [
     "subnet4: [
         {
         {
             "subnet": "10.1.1.0/24",
             "subnet": "10.1.1.0/24",
-            "pool":  [ "10.1.1.2 - 10.1.1.20" ],
+            "pools":  [ { "pool": "10.1.1.2 - 10.1.1.20" } ],
             <userinput>"client-class" "docsis3.0",
             <userinput>"client-class" "docsis3.0",
             "relay": {
             "relay": {
                 "ip-address": "10.1.1.1"
                 "ip-address": "10.1.1.1"
@@ -1740,7 +1749,7 @@ temporarily override a list of interface names and listen on all interfaces.
         },
         },
         {
         {
             "subnet": "192.0.2.0/24",
             "subnet": "192.0.2.0/24",
-            "pool": [ "192.0.2.10 - 192.0.2.20" ],
+            "pools": [ { "pool": "192.0.2.10 - 192.0.2.20" } ],
             <userinput>"relay": {
             <userinput>"relay": {
                 "ip-address": "10.1.1.1"
                 "ip-address": "10.1.1.1"
             }</userinput>
             }</userinput>