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
e9f08452
Commit
e9f08452
authored
Mar 20, 2015
by
Stephen Morris
Browse files
[master] Merge branch 'trac3772'
parents
dc31131a
2fc94dcd
Changes
2
Hide whitespace changes
Inline
Side-by-side
doc/guide/dhcp4-srv.xml
View file @
e9f08452
...
...
@@ -567,9 +567,11 @@ temporarily override a list of interface names and listen on all interfaces.
<screen>
"Dhcp4": {
"subnet4": [
"subnet": "192.0.2.0/24",
<userinput>
"id": 1024
</userinput>
,
...
{
"subnet": "192.0.2.0/24",
<userinput>
"id": 1024
</userinput>
,
...
}
]
}
</screen>
...
...
@@ -594,22 +596,22 @@ temporarily override a list of interface names and listen on all interfaces.
<screen>
"Dhcp4": {
<userinput>
"subnet4": [
"subnet": "192.0.2.0/24",
"pools": [
{
"pool": "192.0.2.10 - 192.0.2.20"
}
]
</userinput>
,
...
]
{
"subnet": "192.0.2.0/24",
"pools": [
{
"pool": "192.0.2.10 - 192.0.2.20"
}
],
...
}
]
</userinput>
}
</screen>
Note that subnet is defined as a simple string, but the
'pools'
parameter is
actually a list of pools: for this reason, the pool definition is enclosed
Note that subnet is defined as a simple string, but the
<command>
pools
</command>
parameter is
actually a list of pools: for this reason, the pool
s
definition is enclosed
in square brackets, even though only one range of addresses is
specified in this example.
</para>
<para>
Each
<command>
pool
</command>
is a structure that contains the parameters
<para>
Each
pool
is a structure that contains the parameters
that describe a single pool. Currently there is only one parameter,
<command>
pool
</command>
, which gives the range of addresses
in the pool. Additional parameters will be added in future
...
...
@@ -624,11 +626,14 @@ temporarily override a list of interface names and listen on all interfaces.
<screen>
"Dhcp4": {
"subnet4": [
<userinput>
"pools": [
{ "pool": "192.0.2.10-192.0.2.20" },
{ "pool": "192.0.2.64/26" }
]
</userinput>
,
...
{
"subnet": "192.0.2.0/24",
<userinput>
"pools": [
{ "pool": "192.0.2.10-192.0.2.20" },
{ "pool": "192.0.2.64/26" }
]
</userinput>
,
...
}
],
...
}
...
...
@@ -1125,7 +1130,7 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp4": {
"option-data": [
{
<userinput>
"name": "foo"
<userinput>
"name": "foo"
,
"space": "vendor-encapsulated-options-space",
"code": 1,
"csv-format": true,
...
...
@@ -1140,7 +1145,7 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp4": {
"option-data": [
{
<userinput>
"name": "vendor-encapsulated-options"
<userinput>
"name": "vendor-encapsulated-options"
,
"space": "dhcp4",
"code": 43,
"csv-format": false,
...
...
@@ -1189,7 +1194,7 @@ temporarily override a list of interface names and listen on all interfaces.
<userinput>
"name": "subopt1",
"code": 1,
"space": "isc",
"type": "ipv4-address"
.
"type": "ipv4-address"
,
"record-types": "",
"array": false,
"encapsulate ""
...
...
@@ -1200,7 +1205,7 @@ temporarily override a list of interface names and listen on all interfaces.
"space": "isc",
"type": "string",
"record-types": "",
"array": false
"array": false
,
"encapsulate": ""
</userinput>
}
],
...
...
@@ -1903,12 +1908,12 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp4": {
<userinput>
"next-server": "192.0.2.123"
</userinput>
,
...,
"subnet4":
{
[
"subnet4":
[
{
<userinput>
"next-server": "192.0.2.234"
</userinput>
,
...
]
}
}
]
}
</screen>
</section>
...
...
@@ -2253,9 +2258,11 @@ temporarily override a list of interface names and listen on all interfaces.
<screen>
"Dhcp4": {
"subnet4": [
{
"subnet": "192.0.2.0/24",
<userinput>
"reservation-mode": "disabled"
</userinput>
,
...
}
]
}
</screen>
...
...
doc/guide/dhcp6-srv.xml
View file @
e9f08452
...
...
@@ -480,9 +480,11 @@ temporarily override a list of interface names and listen on all interfaces.
<screen>
"Dhcp6": {
"subnet6": [
"subnet": "2001:db8:1::/64",
<userinput>
"id": 1024
</userinput>
,
...
{
"subnet": "2001:db8:1::/64",
<userinput>
"id": 1024
</userinput>
,
...
}
]
}
</screen>
...
...
@@ -1044,7 +1046,7 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp6": {
"option-data": [
{
<userinput>
"name": "foo"
<userinput>
"name": "foo"
,
"space": "vendor-encapsulated-options-space",
"code": 1,
"csv-format": true,
...
...
@@ -1061,7 +1063,7 @@ temporarily override a list of interface names and listen on all interfaces.
"option-data": [
...,
{
<userinput>
"name": "vendor-encapsulated-options"
<userinput>
"name": "vendor-encapsulated-options"
,
"space": "dhcp6",
"code": 17,
"csv-format": true,
...
...
@@ -1098,7 +1100,7 @@ temporarily override a list of interface names and listen on all interfaces.
<userinput>
"name": "subopt1",
"code": 1,
"space": "isc",
"type": "ipv6-address"
.
"type": "ipv6-address"
,
"record-types": "",
"array": false,
"encapsulate": ""
</userinput>
...
...
@@ -2197,9 +2199,11 @@ should include options from the isc option space:
<screen>
"Dhcp6": {
"subnet6": [
{
"subnet": "2001:db8:1::/64",
<userinput>
"reservation-mode": "disabled"
</userinput>
,
...
}
]
}
</screen>
...
...
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