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
Sebastian Schrader
Kea
Commits
6e171110
Commit
6e171110
authored
Oct 22, 2013
by
Marcin Siodelski
Browse files
[master] Merge branch 'trac3199'
parents
5eede0e0
7f5a921d
Changes
4
Hide whitespace changes
Inline
Side-by-side
doc/guide/bind10-guide.xml
View file @
6e171110
...
...
@@ -3975,7 +3975,7 @@ Dhcp4/subnet4 [] list (default)
</thead>
<tbody>
<row><entry>
subnet-mask
</entry><entry>
1
</entry><entry>
ipv4-address
</entry><entry>
false
</entry></row>
<row><entry>
time-offset
</entry><entry>
2
</entry><entry>
u
int32
</entry><entry>
false
</entry></row>
<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>
false
</entry></row>
...
...
@@ -4069,6 +4069,8 @@ Dhcp4/subnet4 [] list (default)
-->
<row><entry>
nwip-domain-name
</entry><entry>
62
</entry><entry>
string
</entry><entry>
false
</entry></row>
<row><entry>
nwip-suboptions
</entry><entry>
63
</entry><entry>
binary
</entry><entry>
false
</entry></row>
<row><entry>
tftp-server-name
</entry><entry>
66
</entry><entry>
string
</entry><entry>
false
</entry></row>
<row><entry>
boot-file-name
</entry><entry>
67
</entry><entry>
string
</entry><entry>
false
</entry></row>
<row><entry>
user-class
</entry><entry>
77
</entry><entry>
binary
</entry><entry>
false
</entry></row>
<row><entry>
fqdn
</entry><entry>
81
</entry><entry>
record
</entry><entry>
false
</entry></row>
<row><entry>
dhcp-agent-options
</entry><entry>
82
</entry><entry>
empty
</entry><entry>
false
</entry></row>
...
...
src/lib/dhcp/dhcp4.h
View file @
6e171110
...
...
@@ -125,6 +125,8 @@ enum DHCPOptionType {
DHO_DHCP_CLIENT_IDENTIFIER
=
61
,
DHO_NWIP_DOMAIN_NAME
=
62
,
DHO_NWIP_SUBOPTIONS
=
63
,
DHO_TFTP_SERVER_NAME
=
66
,
DHO_BOOT_FILE_NAME
=
67
,
DHO_USER_CLASS
=
77
,
DHO_FQDN
=
81
,
DHO_DHCP_AGENT_OPTIONS
=
82
,
...
...
src/lib/dhcp/std_option_defs.h
View file @
6e171110
// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2012
-2013
Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
...
...
@@ -68,7 +68,7 @@ RECORD_DECL(FQDN_RECORDS, OPT_UINT8_TYPE, OPT_UINT8_TYPE, OPT_UINT8_TYPE,
/// @brief Definitions of standard DHCPv4 options.
const
OptionDefParams
OPTION_DEF_PARAMS4
[]
=
{
{
"subnet-mask"
,
DHO_SUBNET_MASK
,
OPT_IPV4_ADDRESS_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"time-offset"
,
DHO_TIME_OFFSET
,
OPT_
U
INT32_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"time-offset"
,
DHO_TIME_OFFSET
,
OPT_INT32_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"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
,
...
...
@@ -163,6 +163,10 @@ const OptionDefParams OPTION_DEF_PARAMS4[] = {
OPT_BINARY_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"nwip-domain-name"
,
DHO_NWIP_DOMAIN_NAME
,
OPT_STRING_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"nwip-suboptions"
,
DHO_NWIP_SUBOPTIONS
,
OPT_BINARY_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"tftp-server-name"
,
DHO_TFTP_SERVER_NAME
,
OPT_STRING_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"boot-file-name"
,
DHO_BOOT_FILE_NAME
,
OPT_STRING_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"user-class"
,
DHO_USER_CLASS
,
OPT_BINARY_TYPE
,
false
,
NO_RECORD_DEF
,
""
},
{
"fqdn"
,
DHO_FQDN
,
OPT_RECORD_TYPE
,
false
,
RECORD_DEF
(
FQDN_RECORDS
),
""
},
{
"dhcp-agent-options"
,
DHO_DHCP_AGENT_OPTIONS
,
...
...
src/lib/dhcp/tests/libdhcp++_unittest.cc
View file @
6e171110
...
...
@@ -546,7 +546,7 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
typeid
(
OptionCustom
));
LibDhcpTest
::
testStdOptionDefs4
(
DHO_TIME_OFFSET
,
begin
,
begin
+
4
,
typeid
(
OptionInt
<
u
int32_t
>
));
typeid
(
OptionInt
<
int32_t
>
));
LibDhcpTest
::
testStdOptionDefs4
(
DHO_ROUTERS
,
begin
,
end
,
typeid
(
Option4AddrLst
));
...
...
@@ -732,6 +732,12 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
LibDhcpTest
::
testStdOptionDefs4
(
DHO_NWIP_SUBOPTIONS
,
begin
,
end
,
typeid
(
Option
));
LibDhcpTest
::
testStdOptionDefs4
(
DHO_TFTP_SERVER_NAME
,
begin
,
end
,
typeid
(
OptionString
));
LibDhcpTest
::
testStdOptionDefs4
(
DHO_BOOT_FILE_NAME
,
begin
,
end
,
typeid
(
OptionString
));
LibDhcpTest
::
testStdOptionDefs4
(
DHO_USER_CLASS
,
begin
,
end
,
typeid
(
Option
));
...
...
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