From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 25 Jul 2017 15:52:09 +0000 (+0200)
Subject: [5126] Changes after review
X-Git-Tag: trac5124a_base~26^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c17bbefecbfce75537bfb51332a00879ae396ef;p=thirdparty%2Fkea.git

[5126] Changes after review
---

diff --git a/src/lib/cc/simple_parser.h b/src/lib/cc/simple_parser.h
index 3ff60b7bb8..b8f2fb2e5d 100644
--- a/src/lib/cc/simple_parser.h
+++ b/src/lib/cc/simple_parser.h
@@ -204,6 +204,7 @@ protected:
         }
     }
 
+public:
     /// @brief Returns a value converted to uint32_t
     ///
     /// Instantiation of getIntType() to uint32_t
diff --git a/src/lib/cc/tests/simple_parser_unittest.cc b/src/lib/cc/tests/simple_parser_unittest.cc
index 0a8bf57988..aaffe47ddc 100644
--- a/src/lib/cc/tests/simple_parser_unittest.cc
+++ b/src/lib/cc/tests/simple_parser_unittest.cc
@@ -58,10 +58,6 @@ public:
 
 class SimpleParserClassTest : public SimpleParser {
 public:
-
-    /// Make getUint8 public
-    using SimpleParser::getUint8;
-
     /// @brief Instantiation of getAndConvert
     ///
     /// @param scope specified parameter will be extracted from this scope
diff --git a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
index a16eb6f4cc..0180371958 100644
--- a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
+++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
@@ -101,15 +101,13 @@ ClientClassDefParser::parse(ClientClassDictionaryPtr& class_dictionary,
 
         if (next_server.getFamily() != AF_INET) {
             isc_throw(DhcpConfigError, "Invalid next-server value: '"
-                      << next_server_txt
-                      << "', must be IPv4 address ("
+                      << next_server_txt << "', must be IPv4 address ("
                       << getPosition("next-server", class_def_cfg) << ")");
         }
 
         if (next_server.isV4Bcast()) {
             isc_throw(DhcpConfigError, "Invalid next-server value: '"
-                      << next_server_txt
-                      << "', must not be a broadcast ("
+                      << next_server_txt << "', must not be a broadcast ("
                       << getPosition("next-server", class_def_cfg) << ")");
         }
     }
@@ -146,7 +144,7 @@ ClientClassDefParser::parse(ClientClassDictionaryPtr& class_dictionary,
         class_dictionary->addClass(name, match_expr, options, next_server,
                                    sname, filename);
     } catch (const std::exception& ex) {
-        isc_throw(DhcpConfigError, ex.what()
+        isc_throw(DhcpConfigError, "Can't add class: " << ex.what()
                   << " (" << class_def_cfg->getPosition() << ")");
     }
 }
diff --git a/src/lib/dhcpsrv/parsers/duid_config_parser.cc b/src/lib/dhcpsrv/parsers/duid_config_parser.cc
index 00116d8d8e..355e4f7e71 100644
--- a/src/lib/dhcpsrv/parsers/duid_config_parser.cc
+++ b/src/lib/dhcpsrv/parsers/duid_config_parser.cc
@@ -26,6 +26,9 @@ namespace dhcp {
 void
 DUIDConfigParser::parse(const CfgDUIDPtr& cfg,
                         isc::data::ConstElementPtr duid_configuration) {
+    if (!cfg) {
+        isc_throw(DhcpConfigError, "Must provide valid pointer to cfg when parsing duid");
+    }
 
     std::string param;
     try {