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
a32568b7
Commit
a32568b7
authored
Dec 21, 2012
by
Marcin Siodelski
Browse files
[2545] Separated build and commit phase for all DHCPv4 config parsers.
... also added new BooleanParser.
parent
3c702b89
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/config_parser.cc
View file @
a32568b7
This diff is collapsed.
Click to expand it.
src/bin/dhcp4/tests/config_parser_unittest.cc
View file @
a32568b7
...
...
@@ -389,9 +389,9 @@ TEST_F(Dhcp4ParserTest, poolOutOfSubnet) {
EXPECT_NO_THROW
(
status
=
configureDhcp4Server
(
*
srv_
,
json
));
// returned value must be
2
(values error)
// returned value must be
1
(values error)
// as the pool does not belong to that subnet
checkResult
(
status
,
2
);
checkResult
(
status
,
1
);
}
// Goal of this test is to verify if pools can be defined
...
...
src/lib/dhcpsrv/subnet.cc
View file @
a32568b7
...
...
@@ -77,8 +77,8 @@ void Subnet4::addPool4(const Pool4Ptr& pool) {
if
(
!
inRange
(
first_addr
)
||
!
inRange
(
last_addr
))
{
isc_throw
(
BadValue
,
"Pool4 ("
<<
first_addr
.
toText
()
<<
"-"
<<
last_addr
.
toText
()
<<
" does not belong in this ("
<<
prefix_
<<
"/"
<<
prefix_len_
<<
") subnet4"
);
<<
" does not belong in this ("
<<
prefix_
.
toText
()
<<
"/"
<<
static_cast
<
int
>
(
prefix_len_
)
<<
") subnet4"
);
}
/// @todo: Check that pools do not overlap
...
...
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