Commit 4fc9105e authored by Francis Dupont's avatar Francis Dupont

[365-automatically-calculate-the-values-for-options-58-and-59] Removed extra traling spaces

parent 8cddc84d
......@@ -468,9 +468,9 @@ global_param: valid_lifetime
| config_control
| server_tag
| reservation_mode
| calculate_tee_times
| t1_percent
| t2_percent
| calculate_tee_times
| t1_percent
| t2_percent
| unknown_map_entry
;
......@@ -1081,9 +1081,9 @@ subnet4_param: valid_lifetime
| subnet_4o6_subnet
| user_context
| comment
| calculate_tee_times
| t1_percent
| t2_percent
| calculate_tee_times
| t1_percent
| t2_percent
| unknown_map_entry
;
......@@ -1215,9 +1215,9 @@ shared_network_param: name
| valid_lifetime
| user_context
| comment
| calculate_tee_times
| t1_percent
| t2_percent
| calculate_tee_times
| t1_percent
| t2_percent
| unknown_map_entry
;
......
......@@ -2226,15 +2226,15 @@ Dhcpv4Srv::assignLease(Dhcpv4Exchange& ex) {
}
}
void
void
Dhcpv4Srv::setTeeTimes(const Lease4Ptr& lease, const Subnet4Ptr& subnet, Pkt4Ptr resp) {
uint32_t t2_time = 0;
// If T2 is explicitly configured we'll use try value.
if (!subnet->getT2().unspecified()) {
t2_time = subnet->getT2();
} else if (subnet->getCalculateTeeTimes()) {
// Calculating tee times is enabled, so calculated it.
if (!subnet->getT2().unspecified()) {
t2_time = subnet->getT2();
} else if (subnet->getCalculateTeeTimes()) {
// Calculating tee times is enabled, so calculated it.
t2_time = static_cast<uint32_t>(subnet->getT2Percent() * (lease->valid_lft_));
}
......@@ -2250,9 +2250,9 @@ Dhcpv4Srv::setTeeTimes(const Lease4Ptr& lease, const Subnet4Ptr& subnet, Pkt4Ptr
uint32_t t1_time = 0;
// If T1 is explicitly configured we'll use try value.
if (!subnet->getT1().unspecified()) {
t1_time = subnet->getT1();
} else if (subnet->getCalculateTeeTimes()) {
if (!subnet->getT1().unspecified()) {
t1_time = subnet->getT1();
} else if (subnet->getCalculateTeeTimes()) {
// Calculating tee times is enabled, so calculate it.
t1_time = static_cast<uint32_t>(subnet->getT1Percent() * (lease->valid_lft_));
}
......
......@@ -547,8 +547,8 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
(config_pair.first == "boot-file-name") ||
(config_pair.first == "server-tag") ||
(config_pair.first == "reservation-mode") ||
(config_pair.first == "calculate-tee-times") ||
(config_pair.first == "t1-percent") ||
(config_pair.first == "calculate-tee-times") ||
(config_pair.first == "t1-percent") ||
(config_pair.first == "t2-percent")) {
continue;
}
......
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