From: Stephen Morris <stephen@isc.org>
Date: Fri, 21 Dec 2012 18:21:00 +0000 (+0000)
Subject: [2559] Added parser to list of DHCP6 parsers
X-Git-Tag: bind10-1.0.0-rc-release~76^2~21^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c74f64796e9901c453ab7d4e509d736d037884fd;p=thirdparty%2Fkea.git

[2559] Added parser to list of DHCP6 parsers
---

diff --git a/src/bin/dhcp6/config_parser.cc b/src/bin/dhcp6/config_parser.cc
index 4c6fab15f2..da78852563 100644
--- a/src/bin/dhcp6/config_parser.cc
+++ b/src/bin/dhcp6/config_parser.cc
@@ -17,6 +17,7 @@
 #include <config/ccsession.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp6/config_parser.h>
+#include <dhcp6/dbaccess_parser.h>
 #include <dhcp6/dhcp6_log.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/pool.h>
@@ -1185,6 +1186,8 @@ DhcpConfigParser* createGlobalDhcpConfigParser(const std::string& config_id) {
 
     factories.insert(pair<string, ParserFactory*>(
                          "version", StringParser::Factory));
+    factories.insert(pair<string, ParserFactory*>(
+                         "lease-database", DbAccessParser::factory));
 
     FactoryMap::iterator f = factories.find(config_id);
     if (f == factories.end()) {
diff --git a/src/bin/dhcp6/dbaccess_parser.cc b/src/bin/dhcp6/dbaccess_parser.cc
index 94909d0477..974338050a 100644
--- a/src/bin/dhcp6/dbaccess_parser.cc
+++ b/src/bin/dhcp6/dbaccess_parser.cc
@@ -86,6 +86,7 @@ DbAccessParser::build(isc::data::ConstElementPtr config_value) {
 // Commit the changes - reopen the database with the new parameters
 void
 DbAccessParser::commit() {
+    std::cout << "DB_ACCESS_PARSER_COMMIT: " << dbaccess_ << "\n";
 }
 
 };  // namespace dhcp
diff --git a/src/bin/dhcp6/dhcp6.spec b/src/bin/dhcp6/dhcp6.spec
index c5e9565f5f..3cd45259fd 100644
--- a/src/bin/dhcp6/dhcp6.spec
+++ b/src/bin/dhcp6/dhcp6.spec
@@ -71,6 +71,44 @@
         }
       },
 
+      { "item_name": "lease-database",
+        "item_type": "map",
+        "item_optional": false,
+        "item_default": {"type": "memfile"},
+        "map_item_spec": [
+            {
+                "item_name": "type",
+                "item_type": "string",
+                "item_optional": false,
+                "item_default": ""
+            },
+            {
+                "item_name": "name",
+                "item_type": "string",
+                "item_optional": true,
+                "item_default": ""
+            },
+            {
+                "item_name": "user",
+                "item_type": "string",
+                "item_optional": true,
+                "item_default": ""
+            },
+            {
+                "item_name": "host",
+                "item_type": "string",
+                "item_optional": true,
+                "item_default": ""
+            },
+            {
+                "item_name": "password",
+                "item_type": "string",
+                "item_optional": true,
+                "item_default": ""
+            }
+        ]
+      },
+
       { "item_name": "subnet6",
         "item_type": "list",
         "item_optional": false,