From: Tomek Mrugalski <tomasz@isc.org>
Date: Sun, 13 Nov 2016 16:58:05 +0000 (+0900)
Subject: [5014] Kea-dhcp6 now actually uses new parser (all unit-tests pass)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e22e064d444dc2b4f4b2e986baad75c8ca3833f4;p=thirdparty%2Fkea.git

[5014] Kea-dhcp6 now actually uses new parser (all unit-tests pass)
---

diff --git a/src/bin/dhcp6/kea_controller.cc b/src/bin/dhcp6/kea_controller.cc
index f77ee5af4c..b337b1a4ca 100644
--- a/src/bin/dhcp6/kea_controller.cc
+++ b/src/bin/dhcp6/kea_controller.cc
@@ -11,6 +11,7 @@
 #include <dhcpsrv/parsers/dhcp_config_parser.h>
 #include <dhcp6/json_config_parser.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
+#include <dhcp6/parser_context.h>
 #include <dhcp6/dhcp6_log.h>
 #include <exceptions/exceptions.h>
 
@@ -56,7 +57,12 @@ void configure(const std::string& file_name) {
         }
 
         // Read contents of the file and parse it as JSON
+#if 0
         json = isc::data::Element::fromJSONFile(file_name, true);
+#else
+        Parser6Context parser;
+        json = parser.parseFile(file_name, Parser6Context::PARSER_DHCP6);
+#endif
         if (!json) {
             isc_throw(isc::BadValue, "no configuration found");
         }