BIND 10 trac2657, updated. 6dc113cc0e20a4781ad0f991871966d244371440 [2657] Final minor changes as part of the review
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 5 12:46:40 UTC 2013
The branch, trac2657 has been updated
via 6dc113cc0e20a4781ad0f991871966d244371440 (commit)
via 28c7d972110b86833c31631d563b07a2824efbab (commit)
via 3c200a3decdd5bbc30bbdb9c81f9f206eda98ad9 (commit)
from 83b06fb184c17f70a28ab307347e9eb075ee048d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6dc113cc0e20a4781ad0f991871966d244371440
Author: Stephen Morris <stephen at isc.org>
Date: Tue Feb 5 12:46:20 2013 +0000
[2657] Final minor changes as part of the review
commit 28c7d972110b86833c31631d563b07a2824efbab
Merge: 3c200a3 83b06fb
Author: Stephen Morris <stephen at isc.org>
Date: Tue Feb 5 12:31:03 2013 +0000
[2657] Merge branch 'trac2657' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2657
Conflicts:
doc/guide/bind10-guide.xml
commit 3c200a3decdd5bbc30bbdb9c81f9f206eda98ad9
Author: Stephen Morris <stephen at isc.org>
Date: Tue Feb 5 12:24:42 2013 +0000
[2657] More editing of the DHCP sections of the BIND 10 Guide
-----------------------------------------------------------------------
Summary of changes:
doc/guide/bind10-guide.xml | 115 ++++++++++++++++++++------------------------
1 file changed, 51 insertions(+), 64 deletions(-)
-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 4f91f4e..4907627 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -3609,7 +3609,6 @@ Dhcp4/subnet4 [] list (default)
network configurations. If you want to avoid this, please use the "min-max" notation.
</para>
</section>
- </section>
<section id="dhcp4-std-options">
<title>Standard DHCPv4 options</title>
@@ -3651,7 +3650,7 @@ Dhcp4/subnet4 [] list (default)
</para>
<para>
- Options can also be configured as hex values. If csv-format is
+ Options can also be configured as hexadecimal values. If csv-format is
set to false, option data must be specified as a hex string. The
following commands configure the domain-name-servers option for all
subnets with the following addresses: 192.0.3.1 and 192.0.3.2.
@@ -3915,17 +3914,15 @@ Dhcp4/subnet4 [] list (default)
<section id="dhcp4-vendor-opts">
<title>DHCPv4 vendor specific options</title>
- <para>Currently there are two major option spaces defined: "dhcp4" and "dhcp6".
- They group standard DHCPv4 and DHCPv6 options respectively. Some of the
- standard options may encapsulate other option spaces. Those options that
- belong to the encapsulated option space are appended as sub-options to the
- option that encapsulates it. The name of the option space being encapsulated
- by the standard option is created as a result of the concatenation of the
- standard option's name and the postfix "-space". Thus the option space encapsulated
- by the "vendor-enapsulated-options" option is named "vendor-encapsulated-options-space".
- The following examples show how to define an option "foo" with code 1 that
- consists of IPv4 address, unsigned 16 bit integer and a string. The "foo"
- option is conveyed in a vendor specific information option.
+ <para>
+ Currently there are three option spaces defined: dhcp4 (to
+ be used in DHCPv4 daemon) and dhcp6 (for the DHCPv6 daemon); there
+ is also vendor-encapsulated-options-space, which is empty by default, but options
+ can be defined in it. Those options are called vendor-specific
+ information options. The following examples show how to define
+ an option "foo" with code 1 that consists of an IPv4 address, an
+ unsigned 16 bit integer and a string. The "foo" option is conveyed
+ in a vendor specific information option.
</para>
<para>
The first step is to define the format of the option:
@@ -3951,8 +3948,8 @@ Dhcp4/subnet4 [] list (default)
> <userinput>config set Dhcp4/option-data[0]/csv-format true</userinput>
> <userinput>config set Dhcp4/option-data[0]/data "192.0.2.3, 123, Hello World"</userinput>
> <userinput>config commit</userinput></screen>
- We also set up a dummy value for "vendor-encapsulated-options", the option that conveys
- our sub-option "foo".
+ We also set up a dummy value for vendor-opts, the option that conveys our sub-option "foo".
+ This is required else the option will not be included in messages sent to the client.
<screen>
> <userinput>config add Dhcp4/option-data</userinput>
> <userinput>config set Dhcp4/option-data[1]/name "vendor-encapsulated-options"</userinput>
@@ -3976,6 +3973,7 @@ Dhcp4/subnet4 [] list (default)
</section>
<section id="dhcp4-option-spaces">
+
<title>Nested DHCPv4 options (custom option spaces)</title>
<para>It is sometimes useful to define completely new option
space. This is the case when user creates new option in the
@@ -3984,10 +3982,10 @@ Dhcp4/subnet4 [] list (default)
sub-option codes will have a separate numbering scheme and may
overlap with codes of standard options.
</para>
- <para>Note that it is not required to create new option space when
- defining sub-options for a standard option because it is by
- default created if the standard option is meant to convey
- any sub-options (see <xref linkend="dhcp4-vendor-opts"/>).
+ <para>Note that creation of a new new option space when defining
+ sub-options for a standard option is not required, because it is
+ created by default if the standard option is meant to convey any
+ sub-options (see <xref linkend="dhcp4-vendor-opts"/>).
</para>
<para>
Assume that we want to have a DHCPv4 option called "container" with
@@ -4063,7 +4061,7 @@ Dhcp4/subnet4 [] list (default)
</screen>
</para>
</section>
-
+ </section>
<section id="dhcp4-serverid">
<title>Server Identifier in DHCPv4</title>
<para>
@@ -4160,7 +4158,9 @@ Dhcp4/renew-timer 1000 integer (default)
<simpara>Address rebinding (REBIND) and duplication report (DECLINE)
are not supported yet.</simpara>
</listitem>
-
+ <listitem>
+ <simpara>DNS Update is not yet supported.</simpara>
+ </listitem>
</itemizedlist>
</section>
@@ -4194,17 +4194,7 @@ Dhcp4/renew-timer 1000 integer (default)
> <userinput>config commit</userinput>
</screen>
</para>
- <para>
- To change one of the parameters, simply follow
- the usual <command>bindctl</command> procedure. For example, to make the
- leases longer, change their valid-lifetime parameter:
- <screen>
-> <userinput>config set Dhcp6/valid-lifetime 7200</userinput>
-> <userinput>config commit</userinput></screen>
- Please note that most Dhcp6 parameters are of global scope
- and apply to all defined subnets, unless they are overridden on a
- per-subnet basis.
- </para>
+
<para>
During start-up the server will detect available network interfaces
@@ -4523,8 +4513,8 @@ Dhcp6/subnet6/ list
<tr><td>sip-server-addr</td><td>22</td><td>ipv6-address</td><td>true</td></tr>
<tr><td>dns-servers</td><td>23</td><td>ipv6-address</td><td>true</td></tr>
<tr><td>domain-search</td><td>24</td><td>fqdn</td><td>true</td></tr>
-<tr><td>ia-pd</td><td>25</td><td>record</td><td>false</td></tr>
-<tr><td>iaprefix</td><td>26</td><td>record</td><td>false</td></tr>
+<!-- <tr><td>ia-pd</td><td>25</td><td>record</td><td>false</td></tr> -->
+<!-- <tr><td>iaprefix</td><td>26</td><td>record</td><td>false</td></tr> -->
<tr><td>nis-servers</td><td>27</td><td>ipv6-address</td><td>true</td></tr>
<tr><td>nisp-servers</td><td>28</td><td>ipv6-address</td><td>true</td></tr>
<tr><td>nis-domain-name</td><td>29</td><td>fqdn</td><td>true</td></tr>
@@ -4616,7 +4606,7 @@ Dhcp6/subnet6/ list
list in the "record-types" field and should be those listed in <xref linkend="dhcp-types"/>.
</para>
<para>
- Its values can be later defined as follows:
+ The values of the option are set as follows:
<screen>
> <userinput>config add Dhcp6/option-data</userinput>
> <userinput>config set Dhcp6/option-data[0]/name "bar"</userinput>
@@ -4633,20 +4623,17 @@ Dhcp6/subnet6/ list
<section id="dhcp6-vendor-opts">
<title>DHCPv6 vendor specific options</title>
- <para>Currently there are two major option spaces defined: "dhcp4" and "dhcp6".
- They group standard DHCPv4 and DHCPv6 options respectively. Some of the
- standard options may encapsulate other option spaces. Those options that
- belong to the encapsulated option space are appended as sub-options to the
- option that encapsulates it. The name of the option space being encapsulated
- by the standard option is created as a result of the concatenation of the
- standard option's name and the postfix "-space". Thus the option space encapsulated
- by the "vendor-opts" option is named "vendor-opts-space".
- The following examples show how to define an option "foo" with code 1 that
- consists of IPv6 address, unsigned 16 bit integer and a string. The "foo"
- option is conveyed in a vendor specific information option.
- </para>
- <para>
- The first step is to define the format of the option:
+ <para>
+ Currently there are three option spaces defined: dhcp4 (to be used
+ in DHCPv4 daemon) and dhcp6 (for the DHCPv6 daemon); there is also
+ vendor-opts-space, which is empty by default, but options can be
+ defined in it. Those options are called vendor-specific information
+ options. The following examples show how to define an option "foo"
+ with code 1 that consists of an IPv6 address, an unsigned 16 bit integer
+ and a string. The "foo" option is conveyed in a vendor specific
+ information option. This option comprises a single uint32 value
+ that is set to "12345". The sub-option "foo" follows the data
+ field holding this value.
<screen>
> <userinput>config add Dhcp6/option-def</userinput>
> <userinput>config set Dhcp6/option-def[0]/name "foo"</userinput>
@@ -4684,20 +4671,20 @@ Dhcp6/subnet6/ list
<section id="dhcp6-option-spaces">
<title>Nested DHCPv6 options (custom option spaces)</title>
<para>It is sometimes useful to define completely new option
- space. This is the case when user creates new option in the
- standard option space ("dhcp4 or "dhcp6") and wants this option
- to convey sub-options. Thanks to being in the separate space,
- sub-option codes will have a separate numbering scheme and may
- overlap with codes of standard options.
+ spaces. This is useful if the user wants his new option to
+ convey sub-options that use separate numbering scheme, for
+ example sub-options with codes 1 and 2. Those option codes
+ conflict with standard DHCPv6 options, so a separate option
+ space must be defined.
</para>
<para>Note that it is not required to create new option space when
defining sub-options for a standard option because it is by
default created if the standard option is meant to convey
any sub-options (see <xref linkend="dhcp6-vendor-opts"/>).
</para>
- <para>
- Assume that we want to have a DHCPv6 option called "container" with
- code 102 that conveys two sub-options with codes 1 and 2.
+ <para>
+ Assume that we want to have a DHCPv6 option called "container"
+ with code 102 that conveys two sub-options with codes 1 and 2.
First we need to define the new sub-options:
<screen>
> <userinput>config add Dhcp6/option-def</userinput>
@@ -4724,8 +4711,8 @@ Dhcp6/subnet6/ list
(in this case, "isc").
</para>
<para>
- The next step is to define a regular DHCPv6 option with our desired
- code and specify that it should include options from the new option space:
+The next step is to define a regular DHCPv6 option and specify that it
+should include options from the isc option space:
<screen>
> <userinput>config add Dhcp6/option-def</userinput>
> <userinput>config set Dhcp6/option-def[2]/name "container"</userinput>
@@ -4775,9 +4762,9 @@ Dhcp6/subnet6/ list
<section id="dhcp6-config-subnets">
<title>Subnet Selection</title>
<para>
- The DHCPv6 server may receive requests from local (connected to the same
- subnet as the server) and remote (connecting via relays)
- clients.
+ The DHCPv6 server may receive requests from local (connected
+ to the same subnet as the server) and remote (connecting via
+ relays) clients.
<note>
<para>
Currently relayed DHCPv6 traffic is not supported. The server will
@@ -4815,7 +4802,7 @@ Dhcp6/subnet6/ list
<para>The DHCPv6 protocol uses a "server identifier" (also known
as a DUID) for clients to be able to discriminate between several
servers present on the same link. There are several types of
- DUIDs defined, but RFC 3315 instructs servers to use DUID-LLT if
+ DUIDs defined, but <ulink url="http://tools.ietf.org/html/rfc3315">RFC 3315</ulink> instructs servers to use DUID-LLT if
possible. This format consists of a link-layer (MAC) address and a
timestamp. When started for the first time, the DHCPv6 server will
automatically generate such a DUID and store the chosen value to
@@ -4838,7 +4825,7 @@ Dhcp6/subnet6/ list
</section>
<section id="dhcp6-std">
- <title>Supported DHCPv6 Standards</title>
+ <title>Supported Standards</title>
<para>The following standards and draft standards are currently
supported:</para>
<itemizedlist>
More information about the bind10-changes
mailing list