Commit 196f0896 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3477] Addressed review comments.

parent 5763fe88
......@@ -197,7 +197,7 @@ D2CfgMgr::getD2Params() {
}
std::string
D2CfgMgr::getConfigSummary(const uint16_t) {
D2CfgMgr::getConfigSummary(const uint32_t) {
return (getD2Params()->getConfigSummary());
}
......
......@@ -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.
......
......@@ -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());
}
......
......@@ -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
......
......@@ -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 ("");
}
};
......
......@@ -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 ("");
}
......
......@@ -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
......
......@@ -149,6 +149,7 @@ ConfigurationTest::clearSubnets() {
void
ConfigurationTest::enableDDNS(const bool enable) {
// D2 configuration should always be non-NULL.
CfgMgr::instance().getD2ClientConfig()->enableUpdates(enable);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment