Skip to content
GitLab
Projects
Groups
Snippets
/
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
9702b661
Commit
9702b661
authored
Jul 04, 2017
by
Tomek Mrugalski
🛰
Browse files
[5288] Minor changes after review
parent
556f6591
Changes
3
Hide whitespace changes
Inline
Side-by-side
doc/examples/kea4/multiple-options.json
View file @
9702b661
...
...
@@ -127,15 +127,27 @@
"
data
": "
0
xf
0
"
}
],
"
pools
": [ {
"
pool
": "
192.0
.
2.10
-
192.0
.
2.200
",
"
option-data
": [
{
"
name
": "
domain-name-servers
",
"
data
": "
192.0
.
2.3
,
192.0
.
2.4
"
}
]
} ]
// Now we define pools. There are two pools here.
"
pools
": [ {
// This is the first pool. Nothing spectacular here, just a range
// of addresses.
"
pool
": "
192.0
.
2.10
-
192.0
.
2.100
"
}, {
// This second pool is more interesting. Anyone who gets an
// address from this pool will also get this specific option
// value if asks for DNS servers configuration. This value,
// being more specific, overrides any values that were specified
// on either global or subnet scope.
"
pool
": "
192.0
.
2.101
-
192.0
.
2.200
",
"
option-data
": [
{
"
name
": "
domain-name-servers
",
"
data
": "
192.0
.
2.3
,
192.0
.
2.4
"
}
]
} ]
} ]
},
...
...
src/bin/dhcp4/tests/config_parser_unittest.cc
View file @
9702b661
...
...
@@ -2809,6 +2809,8 @@ TEST_F(Dhcp4ParserTest, optionDataSinglePool) {
testOption
(
*
range
.
first
,
23
,
foo2_expected
,
sizeof
(
foo2_expected
));
}
// This test verifies that it's possible to define different options in
// different pools and those options are not confused.
TEST_F
(
Dhcp4ParserTest
,
optionDataMultiplePools
)
{
ConstElementPtr
x
;
string
config
=
"{ "
+
genIfaceConfig
()
+
","
...
...
src/lib/dhcpsrv/tests/pool_unittest.cc
View file @
9702b661
...
...
@@ -135,7 +135,7 @@ TEST(Pool4Test, addOptions) {
// Add 7 options to another option space. The option codes partially overlap
// with option codes that we have added to dhcp4 option space.
for
(
uint16_t
code
=
105
;
code
<
112
;
++
code
)
{
OptionPtr
option
(
new
Option
(
Option
::
V
6
,
code
,
OptionBuffer
(
10
,
0xFF
)));
OptionPtr
option
(
new
Option
(
Option
::
V
4
,
code
,
OptionBuffer
(
10
,
0xFF
)));
ASSERT_NO_THROW
(
pool
->
getCfgOption
()
->
add
(
option
,
false
,
"isc"
));
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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