From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 21 Aug 2014 05:59:52 +0000 (+0200)
Subject: [3477] Addressed review comments.
X-Git-Tag: trac3482_base~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=196f089624b20fb4fb5f919531008ac08c4b7311;p=thirdparty%2Fkea.git

[3477] Addressed review comments.
---

diff --git a/src/bin/d2/d2_cfg_mgr.cc b/src/bin/d2/d2_cfg_mgr.cc
index 4e1d8978df..05a7c4b124 100644
--- a/src/bin/d2/d2_cfg_mgr.cc
+++ b/src/bin/d2/d2_cfg_mgr.cc
@@ -197,7 +197,7 @@ D2CfgMgr::getD2Params() {
 }
 
 std::string
-D2CfgMgr::getConfigSummary(const uint16_t) {
+D2CfgMgr::getConfigSummary(const uint32_t) {
     return (getD2Params()->getConfigSummary());
 }
 
diff --git a/src/bin/d2/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h
index 6208677d8c..e1afa6778e 100644
--- a/src/bin/d2/d2_cfg_mgr.h
+++ b/src/bin/d2/d2_cfg_mgr.h
@@ -244,7 +244,7 @@ public:
     /// to be returned. This parameter is ignored for the D2.
     ///
     /// @return Summary of the configuration in the textual format.
-    virtual std::string getConfigSummary(const uint16_t selection);
+    virtual std::string getConfigSummary(const uint32_t selection);
 
 protected:
     /// @brief Performs the parsing of the given "params" element.
diff --git a/src/bin/d2/d2_config.cc b/src/bin/d2/d2_config.cc
index 4eba5d331d..6b1ae252ab 100644
--- a/src/bin/d2/d2_config.cc
+++ b/src/bin/d2/d2_config.cc
@@ -92,7 +92,8 @@ D2Params::validateContents() {
 std::string
 D2Params::getConfigSummary() const {
     std::ostringstream s;
-    s << "listening on " << getIpAddress() << ", port " << getPort();
+    s << "listening on " << getIpAddress() << ", port " << getPort()
+      << ", using " << ncrProtocolToString(ncr_protocol_);
     return (s.str());
 }
 
diff --git a/src/bin/d2/d_cfg_mgr.h b/src/bin/d2/d_cfg_mgr.h
index b9d58dc291..2317519f65 100644
--- a/src/bin/d2/d_cfg_mgr.h
+++ b/src/bin/d2/d_cfg_mgr.h
@@ -318,7 +318,7 @@ public:
     /// to be returned.
     ///
     /// @return Summary of the configuration in the textual format.
-    virtual std::string getConfigSummary(const uint16_t selection) = 0;
+    virtual std::string getConfigSummary(const uint32_t selection) = 0;
 
 protected:
     /// @brief Parses a set of scalar configuration elements into global
diff --git a/src/bin/d2/tests/d_cfg_mgr_unittests.cc b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
index 735bff8a50..ba2ccf906c 100644
--- a/src/bin/d2/tests/d_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
@@ -59,7 +59,7 @@ public:
     }
 
     /// @brief Returns summary of configuration in the textual format.
-    virtual std::string getConfigSummary(const uint16_t) {
+    virtual std::string getConfigSummary(const uint32_t) {
         return ("");
     }
 };
diff --git a/src/bin/d2/tests/d_test_stubs.h b/src/bin/d2/tests/d_test_stubs.h
index d836d34aaa..5e658ed274 100644
--- a/src/bin/d2/tests/d_test_stubs.h
+++ b/src/bin/d2/tests/d_test_stubs.h
@@ -183,7 +183,7 @@ public:
     /// @brief Returns configuration summary in the textual format.
     ///
     /// @return Always an empty string.
-    virtual std::string getConfigSummary(const uint16_t) {
+    virtual std::string getConfigSummary(const uint32_t) {
         return ("");
     }
 
@@ -711,7 +711,7 @@ public:
     /// @brief Returns a summary of the configuration in the textual format.
     ///
     /// @return Always an empty string.
-    virtual std::string getConfigSummary(const uint16_t) {
+    virtual std::string getConfigSummary(const uint32_t) {
         return ("");
     }
 
diff --git a/src/lib/dhcpsrv/configuration.h b/src/lib/dhcpsrv/configuration.h
index 16bb1dda82..39af734be9 100644
--- a/src/lib/dhcpsrv/configuration.h
+++ b/src/lib/dhcpsrv/configuration.h
@@ -87,17 +87,26 @@ struct Configuration {
     /// @name Constants for selection of parameters returned by @c getConfigSummary
     ///
     //@{
-    static const uint16_t CFGSEL_NONE    = 0x0000; ///< Nothing selected
-    static const uint16_t CFGSEL_SUBNET4 = 0x0001; ///< Number of IPv4 subnets
-    static const uint16_t CFGSEL_SUBNET6 = 0x0002; ///< Number of IPv6 subnets
-    static const uint16_t CFGSEL_IFACE4  = 0x0004; ///< Number of enabled ifaces
-    static const uint16_t CFGSEL_IFACE6  = 0x0008; ///< Number of v6 ifaces
-    static const uint16_t CFGSEL_DDNS    = 0x0010; ///< DDNS enabled/disabled
-
-    static const uint16_t CFGSEL_SUBNET  = 0x0003; ///< Number of all subnets
-    static const uint16_t CFGSEL_ALL4    = 0x0015; ///< IPv4 related config
-    static const uint16_t CFGSEL_ALL6    = 0x001A; ///< IPv6 related config
-    static const uint16_t CFGSEL_ALL     = 0xFFFF; ///< Whole config
+    /// Nothing selected
+    static const uint32_t CFGSEL_NONE    = 0x00000000;
+    /// Number of IPv4 subnets
+    static const uint32_t CFGSEL_SUBNET4 = 0x00000001;
+    /// Number of IPv6 subnets
+    static const uint32_t CFGSEL_SUBNET6 = 0x00000002;
+    /// Number of enabled ifaces
+    static const uint32_t CFGSEL_IFACE4  = 0x00000004;
+    /// Number of v6 ifaces
+    static const uint32_t CFGSEL_IFACE6  = 0x00000008;
+    /// DDNS enabled/disabled
+    static const uint32_t CFGSEL_DDNS    = 0x00000010;
+    /// Number of all subnets
+    static const uint32_t CFGSEL_SUBNET  = 0x00000003;
+    /// IPv4 related config
+    static const uint32_t CFGSEL_ALL4    = 0x00000015;
+    /// IPv6 related config
+    static const uint32_t CFGSEL_ALL6    = 0x0000001A;
+    /// Whole config
+    static const uint32_t CFGSEL_ALL     = 0xFFFFFFFF;
     //@}
 
     /// @brief logging specific information
diff --git a/src/lib/dhcpsrv/tests/configuration_unittest.cc b/src/lib/dhcpsrv/tests/configuration_unittest.cc
index a917bb8d8d..94692af05f 100644
--- a/src/lib/dhcpsrv/tests/configuration_unittest.cc
+++ b/src/lib/dhcpsrv/tests/configuration_unittest.cc
@@ -149,6 +149,7 @@ ConfigurationTest::clearSubnets() {
 
 void
 ConfigurationTest::enableDDNS(const bool enable) {
+    // D2 configuration should always be non-NULL.
     CfgMgr::instance().getD2ClientConfig()->enableUpdates(enable);
 }