diff options
| -rw-r--r-- | src/lib/dhcpsrv/dhcpsrv_messages.mes | 6 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/ncr_generator.cc | 2 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/srv_config.h | 6 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc | 4 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/tests/ncr_generator_unittest.cc | 6 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc | 12 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/tests/srv_config_unittest.cc | 2 | ||||
| -rw-r--r-- | src/lib/util/str.h | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index 3329e13f60..6d6185a3e9 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -967,8 +967,8 @@ message) that is unknown to the software. This is a configuration error. % DHCPSRV_DDNS_TTL_TOO_SMALL %1 of lease life time %2 is %3, using minimum of %4 instead. Logged at debug log level 55. A debug message issued when the DDNS TTL value calculated using the -ddns-ttl-percent if specfieed or (0.33 if not) is too small. Kea will -ignore the value and is the minimum (ddns-ttl-min is specifed or 600 +ddns-ttl-percent if specified or (0.33 if not) is too small. Kea will +ignore the value and use the minimum (ddns-ttl-min if specifed or 600 seconds if not). The message details include the percentage, the lease life time, the calculated TTL, and the value actually used. @@ -977,6 +977,6 @@ Logged at debug log level 55. A debug message issued when the DDNS TTL value calculated using the ddns-ttl-percent if specfieed or (0.33 if not) is larger than the the specified value of ddns-ttl-max. Kea will ignore the value and -use is the specified maxinimum instead. The message details include +use the specified maximum instead. The message details include the percentage, the lease life time, the calculated TTL, and the value actually used. diff --git a/src/lib/dhcpsrv/ncr_generator.cc b/src/lib/dhcpsrv/ncr_generator.cc index 36417f06c3..c9584bd4f4 100644 --- a/src/lib/dhcpsrv/ncr_generator.cc +++ b/src/lib/dhcpsrv/ncr_generator.cc @@ -160,7 +160,7 @@ uint32_t calculateDdnsTtl(uint32_t lease_lft, // Adjust for minimum and maximum. // If we have a custom mininum enforce it, otherwise per RFC 4702 it // should not less than 600. - uint32_t ttl_min = (ddns_ttl_min.get() > 0) ? ddns_ttl_min.get() : 600; + uint32_t ttl_min = (ddns_ttl_min.get() > 0) ? ddns_ttl_min.get() : 600; if (ttl < ttl_min) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL_DATA, DHCPSRV_DDNS_TTL_TOO_SMALL) diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h index 33f846fefb..0b2b1b047f 100644 --- a/src/lib/dhcpsrv/srv_config.h +++ b/src/lib/dhcpsrv/srv_config.h @@ -976,10 +976,10 @@ public: const std::string& name) const; /// @brief Conducts sanity checks on global DDNS ttl parameters: - /// ddsn-ttl, ddsn-ttl-percent, ddns-ttl-min, ddns-ttl-max + /// ddns-ttl, ddns-ttl-percent, ddns-ttl-min, ddns-ttl-max /// - /// If ddns-ttl is specified none of the others can be - /// If ddns-ttl-min and ddsn-ttl-max are specified max cannot + /// If ddns-ttl is specified none of the others can be. + /// If ddns-ttl-min and ddns-ttl-max are specified max cannot /// be less than min. /// /// @throw Throws BadValue if any of the rules are violated. diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc index e8720bfeb0..a9d76564c0 100644 --- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc +++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc @@ -73,8 +73,8 @@ public: CfgMgr::instance().clear(); } - // Verifies valid permuatations of ddns-ttl-percent, ddns-ttl, - // ddns-ttl-min, and ddns-ttl-max values for SubnetX. + // Verifies valid permuatations of ddns-ttl-percent, ddns-ttl, + // ddns-ttl-min, and ddns-ttl-max values for SubnetX. template<typename ParserType, typename NetworkPtrType> void validDdnsTtlParmatersSubnet(int family) { struct Scenario { diff --git a/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc b/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc index da877d1765..98807197c4 100644 --- a/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc +++ b/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc @@ -761,16 +761,16 @@ TEST_F(NCRGenerator4Test, calculateDdnsTtlThroughQueueNcr) { // Explicit ttl wins over specified percent { __LINE__, 2100, 0.25, 900, no_min, no_max, 900 }, - // Explicit ttl wins over specified minumum + // Explicit ttl wins over specified minimum { __LINE__, 2100, no_percent, 900, 1000, no_max, 900 }, // Explicit ttl wins over specified maxiumum { __LINE__, 2100, no_percent, 900, no_min, 800, 900 }, - // Specified percent > RFC minumum + // Specified percent > RFC minimum { __LINE__, 2100, 0.5, no_ttl, no_min, no_max, 1050 }, - // Specified percent < RFC minumum + // Specified percent < RFC minimum { __LINE__, 2100, 0.25, no_ttl, no_min, no_max, 600 }, // Specified percent < specified minimum < RFC minimum diff --git a/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc b/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc index f384700d40..3128867206 100644 --- a/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc +++ b/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc @@ -107,7 +107,7 @@ public: /// @return A reference to the Network created if parsing is successful virtual Network& parseIntoNetwork(ConstElementPtr test_config) = 0; - // Verifies valid permuatations of ddns-ttl-percent, ddns-ttl, + // Verifies valid permutations of ddns-ttl-percent, ddns-ttl, // ddns-ttl-min, and ddns-ttl-max values for SharedNetwork4. template<typename NetworkTypePtr, typename ParserType> void validDdnsTtlParmatersTest() { @@ -197,7 +197,7 @@ public: } } - // Verifies invalid permuatations of ddns-ttl-percent, ddns-ttl, + // Verifies invalid permatations of ddns-ttl-percent, ddns-ttl, // ddns-ttl-min, and ddns-ttl-max values for SharedNetwork. template<typename ParserType> void invalidDdnsTtlParmatersTest() { @@ -1362,25 +1362,25 @@ TEST_F(SharedNetwork6ParserTest, deprecatedClientClass) { " (<string>:1:2)"); } -// Verifies valid permuatations of ddns-ttl-percent, ddns-ttl, +// Verifies valid permutations of ddns-ttl-percent, ddns-ttl, // ddns-ttl-min, and ddns-ttl-max values for SharedNetwork4. TEST_F(SharedNetwork4ParserTest, validDdnsTtlParmaters4) { validDdnsTtlParmatersTest<SharedNetwork4Ptr, SharedNetwork4Parser>(); } -// Verifies valid permuatations of ddns-ttl-percent, ddns-ttl, +// Verifies valid permutations of ddns-ttl-percent, ddns-ttl, // ddns-ttl-min, and ddns-ttl-max values for SharedNetwork6. TEST_F(SharedNetwork6ParserTest, validDdnsTtlParmaters6) { validDdnsTtlParmatersTest<SharedNetwork6Ptr, SharedNetwork6Parser>(); } -// Verifies invalid permuatations of ddns-ttl-percent, ddns-ttl, +// Verifies invalid permutations of ddns-ttl-percent, ddns-ttl, // ddns-ttl-min, and ddns-ttl-max values for Subnet4. TEST_F(SharedNetwork4ParserTest, invalidDdnsTtlParmaters4) { invalidDdnsTtlParmatersTest<SharedNetwork4Parser>(); } -// Verifies invalid permuatations of ddns-ttl-percent, ddns-ttl, +// Verifies invalid permutations of ddns-ttl-percent, ddns-ttl, // ddns-ttl-min, and ddns-ttl-max values for Subnet6. TEST_F(SharedNetwork6ParserTest, invalidDdnsTtlParmaters6) { invalidDdnsTtlParmatersTest<SharedNetwork6Parser>(); diff --git a/src/lib/dhcpsrv/tests/srv_config_unittest.cc b/src/lib/dhcpsrv/tests/srv_config_unittest.cc index 531b8ce7fe..100660da86 100644 --- a/src/lib/dhcpsrv/tests/srv_config_unittest.cc +++ b/src/lib/dhcpsrv/tests/srv_config_unittest.cc @@ -2214,7 +2214,7 @@ TEST_F(SrvConfigTest, sanityChecksLifetime) { } } -// Verifies that sanityChecksDdnsTtlParams works as expected. +// Verifies that sanityChecksDdnsTtlParameters works as expected. TEST_F(SrvConfigTest, sanityChecksDdnsTtlParameters) { { SCOPED_TRACE("none"); diff --git a/src/lib/util/str.h b/src/lib/util/str.h index c89294dc11..d048f0181d 100644 --- a/src/lib/util/str.h +++ b/src/lib/util/str.h @@ -290,7 +290,7 @@ dumpAsHex(const uint8_t* data, size_t length); /// /// @param val double to convert /// @param precision number of maxium number decimal places to output -/// @return string representaion of val +/// @return string representation of val std::string dumpDouble(double val, size_t precision = 5); } // namespace str |