From e22e064d444dc2b4f4b2e986baad75c8ca3833f4 Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Mon, 14 Nov 2016 01:58:05 +0900 Subject: [PATCH] [5014] Kea-dhcp6 now actually uses new parser (all unit-tests pass) --- src/bin/dhcp6/kea_controller.cc | 6 ++++++ 1 file changed, 6 insertions(+) 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 #include #include +#include #include #include @@ -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"); } -- 2.47.2