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
Sebastian Schrader
Kea
Commits
54d1dbe6
Commit
54d1dbe6
authored
Jun 30, 2015
by
Marcin Siodelski
Browse files
[master] Merge branch 'trac3887'
parents
1c1902f5
20081a5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
doc/guide/dhcp4-srv.xml
View file @
54d1dbe6
...
...
@@ -921,7 +921,7 @@ temporarily override a list of interface names and listen on all interfaces.
<row><entry>
time-offset
</entry><entry>
2
</entry><entry>
int32
</entry><entry>
false
</entry></row>
<row><entry>
routers
</entry><entry>
3
</entry><entry>
ipv4-address
</entry><entry>
true
</entry></row>
<row><entry>
time-servers
</entry><entry>
4
</entry><entry>
ipv4-address
</entry><entry>
true
</entry></row>
<row><entry>
name-servers
</entry><entry>
5
</entry><entry>
ipv4-address
</entry><entry>
fals
e
</entry></row>
<row><entry>
name-servers
</entry><entry>
5
</entry><entry>
ipv4-address
</entry><entry>
tru
e
</entry></row>
<row><entry>
domain-name-servers
</entry><entry>
6
</entry><entry>
ipv4-address
</entry><entry>
true
</entry></row>
<row><entry>
log-servers
</entry><entry>
7
</entry><entry>
ipv4-address
</entry><entry>
true
</entry></row>
<row><entry>
cookie-servers
</entry><entry>
8
</entry><entry>
ipv4-address
</entry><entry>
true
</entry></row>
...
...
src/lib/dhcp/std_option_defs.h
View file @
54d1dbe6
...
...
@@ -80,7 +80,7 @@ const OptionDefParams OPTION_DEF_PARAMS4[] = {
{
"routers"
,
DHO_ROUTERS
,
OPT_IPV4_ADDRESS_TYPE
,
true
,
NO_RECORD_DEF
,
""
},
{
"time-servers"
,
DHO_TIME_SERVERS
,
OPT_IPV4_ADDRESS_TYPE
,
true
,
NO_RECORD_DEF
,
""
},
{
"name-servers"
,
DHO_NAME_SERVERS
,
OPT_IPV4_ADDRESS_TYPE
,
fals
e
,
NO_RECORD_DEF
,
""
},
tru
e
,
NO_RECORD_DEF
,
""
},
{
"domain-name-servers"
,
DHO_DOMAIN_NAME_SERVERS
,
OPT_IPV4_ADDRESS_TYPE
,
true
,
NO_RECORD_DEF
,
""
},
{
"log-servers"
,
DHO_LOG_SERVERS
,
OPT_IPV4_ADDRESS_TYPE
,
true
,
NO_RECORD_DEF
,
""
},
...
...
src/lib/dhcp/tests/libdhcp++_unittest.cc
View file @
54d1dbe6
...
...
@@ -725,7 +725,7 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
typeid
(
Option4AddrLst
));
LibDhcpTest
::
testStdOptionDefs4
(
DHO_NAME_SERVERS
,
begin
,
end
,
typeid
(
Option
Custom
));
typeid
(
Option
4AddrLst
));
LibDhcpTest
::
testStdOptionDefs4
(
DHO_DOMAIN_NAME_SERVERS
,
begin
,
end
,
typeid
(
Option4AddrLst
));
...
...
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