From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 29 Oct 2012 10:06:32 +0000 (+0100)
Subject: [2318] Added global option values in dhcp6 spec.
X-Git-Tag: trac2487_base~28^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce0a6a9742cd2c18cb4c33ad0f174690ed1cbfc9;p=thirdparty%2Fkea.git

[2318] Added global option values in dhcp6 spec.
---

diff --git a/src/bin/dhcp6/dhcp6.spec b/src/bin/dhcp6/dhcp6.spec
index 818ea4b176..c5e9565f5f 100644
--- a/src/bin/dhcp6/dhcp6.spec
+++ b/src/bin/dhcp6/dhcp6.spec
@@ -40,6 +40,37 @@
         "item_default": 4000
       },
 
+      { "item_name": "option-data",
+        "item_type": "list",
+        "item_optional": false,
+        "item_default": [],
+        "list_item_spec":
+        {
+          "item_name": "single-option-data",
+          "item_type": "map",
+          "item_optional": false,
+          "item_default": {},
+          "map_item_spec": [
+          {
+            "item_name": "name",
+            "item_type": "string",
+            "item_optional": false,
+            "item_default": ""
+          },
+
+          { "item_name": "code",
+            "item_type": "integer",
+            "item_optional": false,
+            "item_default": 0
+          },
+          { "item_name": "data",
+            "item_type": "string",
+            "item_optional": false,
+            "item_default": ""
+          } ]
+        }
+      },
+
       { "item_name": "subnet6",
         "item_type": "list",
         "item_optional": false,
@@ -99,29 +130,32 @@
                   "item_default": [],
                   "list_item_spec":
                   {
-                      "item_name": "single-option-data",
-                      "item_type": "map",
+                    "item_name": "single-option-data",
+                    "item_type": "map",
+                    "item_optional": false,
+                    "item_default": {},
+                    "map_item_spec": [
+                    {
+                      "item_name": "name",
+                      "item_type": "string",
                       "item_optional": false,
-                      "item_default": {},
-                      "map_item_spec": [
-                      { "item_name": "name",
-                        "item_type": "string",
-                        "item_optional": false,
-                        "item_default": ""
-                      },
-                      { "item_name": "code",
-                        "item_type": "integer",
-                        "item_optional": false,
-                        "item_default": 0
-                      },
-                      { "item_name": "data",
-                        "item_type": "string",
-                        "item_optional": false,
-                        "item_default": ""
-                      } ]
-                  },
-              } ]
-          }
+                      "item_default": ""
+                    },
+                    {
+                      "item_name": "code",
+                      "item_type": "integer",
+                      "item_optional": false,
+                      "item_default": 0
+                    },
+                    {
+                      "item_name": "data",
+                      "item_type": "string",
+                      "item_optional": false,
+                      "item_default": ""
+                    } ]
+                  }
+                } ]
+            }
        }
     ],
     "commands": [