mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

[#1418] Checkpoint: more renames

Browse Source
This commit is contained in:
Francis Dupont
2020-10-02 17:10:31 +02:00
parent 5bd2584e98
commit 2fbc4fc0e3
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/dhcp4/dhcp4_parser.yy
View File

@@ -484,7 +484,7 @@ global_param: valid_lifetime
| t1_percent
| t2_percent
| cache_threshold
| cache_max
| cache_max_age
| loggers
| hostname_char_set
| hostname_char_replacement

2
src/bin/dhcp4/json_config_parser.cc
View File

@@ -612,7 +612,7 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
(config_pair.first == "t1-percent") ||
(config_pair.first == "t2-percent") ||
(config_pair.first == "cache-threshold") ||
(config_pair.first == "cache-max") ||
(config_pair.first == "cache-max-age") ||
(config_pair.first == "loggers") ||
(config_pair.first == "hostname-char-set") ||
(config_pair.first == "hostname-char-replacement") ||

2
src/bin/dhcp6/json_config_parser.cc
View File

@@ -745,7 +745,7 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
(config_pair.first == "t1-percent") ||
(config_pair.first == "t2-percent") ||
(config_pair.first == "cache-threshold") ||
(config_pair.first == "cache-max") ||
(config_pair.first == "cache-max-age") ||
(config_pair.first == "loggers") ||
(config_pair.first == "hostname-char-set") ||
(config_pair.first == "hostname-char-replacement") ||

4
src/lib/dhcpsrv/parsers/base_network_parser.cc
View File

@@ -192,8 +192,8 @@ BaseNetworkParser::parseCacheParams(const ConstElementPtr& network_data,
network->setCacheThreshold(cache_threshold);
}
if (network_data->contains("cache-max")) {
network->setCacheMax(getInteger(network_data, "cache-max"));
if (network_data->contains("cache-max-age")) {
network->setCacheMaxAge(getInteger(network_data, "cache-max-age"));
}
}

2
src/lib/dhcpsrv/parsers/base_network_parser.h
View File

@@ -66,7 +66,7 @@ protected:
///
/// The parsed parameters are:
/// - cache-threshold,
/// - cache-max.
/// - cache-max-age.
///
/// @param network_data Data element holding network configuration
/// to be parsed.

8
src/lib/dhcpsrv/parsers/simple_parser4.cc
View File

@@ -88,7 +88,7 @@ const SimpleKeywords SimpleParser4::GLOBAL4_PARAMETERS = {
{ "statistic-default-sample-age", Element::integer },
{ "multi-threading", Element::map },
{ "cache-threshold", Element::real },
{ "cache-max", Element::integer }
{ "cache-max-age", Element::integer }
};
/// @brief This table defines default global values for DHCPv4
@@ -226,7 +226,7 @@ const SimpleKeywords SimpleParser4::SUBNET4_PARAMETERS = {
{ "store-extended-info", Element::boolean },
{ "metadata", Element::map },
{ "cache-threshold", Element::real },
{ "cache-max", Element::integer }
{ "cache-max-age", Element::integer }
};
/// @brief This table defines default values for each IPv4 subnet.
@@ -279,7 +279,7 @@ const ParamsList SimpleParser4::INHERIT_TO_SUBNET4 = {
"t2-percent",
"store-extended-info",
"cache-threshold",
"cache-max"
"cache-max-age"
};
/// @brief This table defines all pool parameters.
@@ -337,7 +337,7 @@ const SimpleKeywords SimpleParser4::SHARED_NETWORK4_PARAMETERS = {
{ "store-extended-info", Element::boolean },
{ "metadata", Element::map },
{ "cache-threshold", Element::real },
{ "cache-max", Element::integer }
{ "cache-max-age", Element::integer }
};
/// @brief This table defines default values for each IPv4 shared network.

8
src/lib/dhcpsrv/parsers/simple_parser6.cc
View File

@@ -89,7 +89,7 @@ const SimpleKeywords SimpleParser6::GLOBAL6_PARAMETERS = {
{ "statistic-default-sample-age", Element::integer },
{ "multi-threading", Element::map },
{ "cache-threshold", Element::real },
{ "cache-max", Element::integer }
{ "cache-max-age", Element::integer }
};
/// @brief This table defines default global values for DHCPv6
@@ -220,7 +220,7 @@ const SimpleKeywords SimpleParser6::SUBNET6_PARAMETERS = {
{ "store-extended-info", Element::boolean },
{ "metadata", Element::map },
{ "cache-threshold", Element::real },
{ "cache-max", Element::integer }
{ "cache-max-age", Element::integer }
};
/// @brief This table defines default values for each IPv6 subnet.
@@ -273,7 +273,7 @@ const ParamsList SimpleParser6::INHERIT_TO_SUBNET6 = {
"t2-percent",
"store-extended-info",
"cache-threshold",
"cache-max"
"cache-max-age"
};
/// @brief This table defines all pool parameters.
@@ -350,7 +350,7 @@ const SimpleKeywords SimpleParser6::SHARED_NETWORK6_PARAMETERS = {
{ "store-extended-info", Element::boolean },
{ "metadata", Element::map },
{ "cache-threshold", Element::real },
{ "cache-max", Element::integer }
{ "cache-max-age", Element::integer }
};
/// @brief This table defines default values for each IPv6 subnet.