Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
68b2cb03
Commit
68b2cb03
authored
Jul 01, 2019
by
Thomas Markwalder
Browse files
[
#686
,
!403
] Addressed review comments
Fixed cosmetics. Spacing etc...
parent
fc9307ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/lib/dhcpsrv/parsers/simple_parser4.cc
View file @
68b2cb03
...
...
@@ -166,8 +166,8 @@ const SimpleDefaults SimpleParser4::IFACE4_DEFAULTS = {
/// @brief This table defines default values for dhcp-queue-control in DHCPv4.
const
SimpleDefaults
SimpleParser4
::
DHCP_QUEUE_CONTROL4_DEFAULTS
=
{
{
"enable-queue"
,
Element
::
boolean
,
"false"
},
{
"queue-type"
,
Element
::
string
,
"kea-ring4"
},
{
"capacity"
,
Element
::
integer
,
"500"
}
{
"queue-type"
,
Element
::
string
,
"kea-ring4"
},
{
"capacity"
,
Element
::
integer
,
"500"
}
};
/// @brief This defines default values for sanity checking for DHCPv4.
...
...
src/lib/dhcpsrv/parsers/simple_parser6.cc
View file @
68b2cb03
...
...
@@ -149,8 +149,8 @@ const SimpleDefaults SimpleParser6::IFACE6_DEFAULTS = {
/// @brief This table defines default values for dhcp-queue-control in DHCPv4.
const
SimpleDefaults
SimpleParser6
::
DHCP_QUEUE_CONTROL6_DEFAULTS
=
{
{
"enable-queue"
,
Element
::
boolean
,
"false"
},
{
"queue-type"
,
Element
::
string
,
"kea-ring6"
},
{
"capacity"
,
Element
::
integer
,
"500"
}
{
"queue-type"
,
Element
::
string
,
"kea-ring6"
},
{
"capacity"
,
Element
::
integer
,
"500"
}
};
/// @brief This defines default values for sanity checking for DHCPv6.
...
...
src/lib/dhcpsrv/sanity_checker.cc
View file @
68b2cb03
...
...
@@ -94,9 +94,6 @@ void SanityChecker::checkLeaseInternal(LeasePtrType& lease, const CfgConsistency
}
switch
(
checks
->
getLeaseSanityCheck
())
{
case
CfgConsistency
::
LEASE_CHECK_NONE
:
// No checks whatsoever, just return the lease as-is.
break
;
case
CfgConsistency
::
LEASE_CHECK_WARN
:
if
(
lease
->
subnet_id_
!=
id
)
{
// Print a warning, but return the lease as is.
...
...
@@ -149,6 +146,7 @@ void SanityChecker::checkLeaseInternal(LeasePtrType& lease, const CfgConsistency
}
break
;
case
CfgConsistency
::
LEASE_CHECK_DEL
:
if
(
lease
->
subnet_id_
!=
id
)
{
LOG_INFO
(
dhcpsrv_logger
,
DHCPSRV_LEASE_SANITY_FAIL_DISCARD
)
...
...
@@ -158,6 +156,13 @@ void SanityChecker::checkLeaseInternal(LeasePtrType& lease, const CfgConsistency
lease
.
reset
();
}
break
;
default:
// Shouldn't get here but some compilers and analyzers
// complain. We'll we treat it as NONE and return the
// lease as-is.
break
;
}
// Additional checks may be implemented in the future here.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment