From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 6 Mar 2019 15:44:29 +0000 (+0100)
Subject: [#488,!259] Rename parameters in the base network parser.
X-Git-Tag: 494-dhcp4configparser-sharednetworkssanitychecks-is-buggy_base~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3400b9872c16df58f653ed133332d22c5307747;p=thirdparty%2Fkea.git

[#488,!259] Rename parameters in the base network parser.
---

diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.cc b/src/lib/dhcpsrv/parsers/base_network_parser.cc
index 01f74ff490..a48299a0da 100644
--- a/src/lib/dhcpsrv/parsers/base_network_parser.cc
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.cc
@@ -16,41 +16,41 @@ namespace isc {
 namespace dhcp {
 
 void
-BaseNetworkParser::parseCommonTimers(const ConstElementPtr& shared_network_data,
+BaseNetworkParser::parseCommonTimers(const ConstElementPtr& network_data,
                                      NetworkPtr& network) {
     Triplet<uint32_t> t1;
-    if (shared_network_data->contains("renew-timer")) {
-        network->setT1(getInteger(shared_network_data, "renew-timer"));
+    if (network_data->contains("renew-timer")) {
+        network->setT1(getInteger(network_data, "renew-timer"));
     }
 
     Triplet<uint32_t> t2;
-    if (shared_network_data->contains("rebind-timer")) {
-        network->setT2(getInteger(shared_network_data, "rebind-timer"));
+    if (network_data->contains("rebind-timer")) {
+        network->setT2(getInteger(network_data, "rebind-timer"));
     }
 
     Triplet<uint32_t> valid;
-    if (shared_network_data->contains("valid-lifetime")) {
-        network->setValid(getInteger(shared_network_data, "valid-lifetime"));
+    if (network_data->contains("valid-lifetime")) {
+        network->setValid(getInteger(network_data, "valid-lifetime"));
     }
 }
 
 void
-BaseNetworkParser::parseTeePercents(const ConstElementPtr& shared_network_data,
+BaseNetworkParser::parseTeePercents(const ConstElementPtr& network_data,
                                     NetworkPtr& network) {
     bool calculate_tee_times = network->getCalculateTeeTimes();
-    if (shared_network_data->contains("calculate-tee-times")) {
-        bool calculate_tee_times = getBoolean(shared_network_data, "calculate-tee-times");
+    if (network_data->contains("calculate-tee-times")) {
+        bool calculate_tee_times = getBoolean(network_data, "calculate-tee-times");
         network->setCalculateTeeTimes(calculate_tee_times);
     }
 
     Optional<double> t2_percent;
-    if (shared_network_data->contains("t2-percent")) {
-        t2_percent = getDouble(shared_network_data, "t2-percent");
+    if (network_data->contains("t2-percent")) {
+        t2_percent = getDouble(network_data, "t2-percent");
     }
 
     Optional<double> t1_percent;
-    if (shared_network_data->contains("t1-percent")) {
-        t1_percent = getDouble(shared_network_data, "t1-percent");
+    if (network_data->contains("t1-percent")) {
+        t1_percent = getDouble(network_data, "t1-percent");
     }
     if (calculate_tee_times) {
         if (!t2_percent.unspecified() && ((t2_percent.get() <= 0.0) ||
diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.h b/src/lib/dhcpsrv/parsers/base_network_parser.h
index 8f3862f43b..61cadf287c 100644
--- a/src/lib/dhcpsrv/parsers/base_network_parser.h
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.h
@@ -30,7 +30,7 @@ protected:
     /// configuration to be parsed.
     /// @param [out] network Pointer to a network in which parsed data is
     /// to be stored.
-    void parseCommonTimers(const data::ConstElementPtr& shared_network_data,
+    void parseCommonTimers(const data::ConstElementPtr& network_data,
                            NetworkPtr& network);
 
     /// @brief Parses parameters related to "percent" timers settngs.
@@ -40,14 +40,14 @@ protected:
     /// - t1-percent,
     /// - t2-percent.
     ///
-    /// @param shared_network_data Data element holding shared network
+    /// @param network_data Data element holding shared network
     /// configuration to be parsed.
     /// @param [out] network Pointer to a network in which parsed data is
     /// to be stored.
     ///
     /// @throw DhcpConfigError if configuration of these parameters is
     /// invalid.
-    void parseTeePercents(const data::ConstElementPtr& shared_network_data,
+    void parseTeePercents(const data::ConstElementPtr& network_data,
                           NetworkPtr& network);
 };