Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
Kea
Commits
3ac15510
Commit
3ac15510
authored
Dec 21, 2012
by
Marcin Siodelski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[2545] Separate the build and commit phases for all parsers.
parent
61c303c8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
237 additions
and
164 deletions
+237
-164
src/bin/dhcp6/config_parser.cc
src/bin/dhcp6/config_parser.cc
+232
-160
src/bin/dhcp6/tests/config_parser_unittest.cc
src/bin/dhcp6/tests/config_parser_unittest.cc
+3
-2
src/lib/dhcpsrv/subnet.cc
src/lib/dhcpsrv/subnet.cc
+2
-2
No files found.
src/bin/dhcp6/config_parser.cc
View file @
3ac15510
This diff is collapsed.
Click to expand it.
src/bin/dhcp6/tests/config_parser_unittest.cc
View file @
3ac15510
...
...
@@ -382,11 +382,12 @@ TEST_F(Dhcp6ParserTest, poolOutOfSubnet) {
EXPECT_NO_THROW
(
status
=
configureDhcp6Server
(
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
ASSERT_TRUE
(
status
);
comment_
=
parseAnswer
(
rcode_
,
status
);
EXPECT_EQ
(
2
,
rcode_
);
EXPECT_EQ
(
1
,
rcode_
);
}
// Goal of this test is to verify if pools can be defined
...
...
src/lib/dhcpsrv/subnet.cc
View file @
3ac15510
...
...
@@ -148,10 +148,10 @@ void Subnet6::addPool6(const Pool6Ptr& pool) {
if
(
!
inRange
(
first_addr
)
||
!
inRange
(
last_addr
))
{
isc_throw
(
BadValue
,
"Pool6 ("
<<
first_addr
.
toText
()
<<
"-"
<<
last_addr
.
toText
()
<<
" does not belong in this ("
<<
prefix_
<<
"/"
<<
prefix_len_
<<
") does not belong in this ("
<<
prefix_
.
toText
()
<<
"/"
<<
static_cast
<
int
>
(
prefix_len_
)
<<
") subnet6"
);
}
/// @todo: Check that pools do not overlap
pools_
.
push_back
(
pool
);
...
...
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