Skip to content

GitLab

Commit 26174791 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3414] Removed references to b10-dhcp in the Kea documentation.

parent 169b164a
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 98 deletions
doc/guide/ddns.xml
View file @ 26174791
......@@ -7,9 +7,9 @@
<chapter id="dhcp-ddns-server">
<title>The DHCP-DDNS Server</title>
<para>
The DHCP-DDNS Server (b10-dhcp-ddns, known informally as D2) conducts the client side of
The DHCP-DDNS Server (kea-dhcp-ddns, known informally as D2) conducts the client side of
the DDNS protocol (defined in RFC 2136) on behalf of the DHCPv4 and DHCPv6
servers (b10-dhcp4 and b10-dhcp6 respectively). The DHCP servers construct
servers (kea-dhcp4 and kea-dhcp6 respectively). The DHCP servers construct
DDNS update requests, known as NameChangeRequests (NCRs), based upon DHCP
lease change events and then post these to D2. D2 attempts to match
each such request to the appropriate DNS server(s) and carry out the
......@@ -51,7 +51,7 @@
<section id="dhcp-ddns-server-start-stop">
<title>Starting and Stopping the DHCP-DDNS Server</title>
<para>
<command>b10-dhcp-ddns</command> is the BIND 10 DHCP-DDNS server and,
<command>kea-dhcp-ddns</command> is the BIND 10 DHCP-DDNS server and,
like other parts of BIND 10, is configured through the
<command>bindctl</command> program.
</para>
......@@ -60,16 +60,16 @@
configuring the server is to add it to the list of running BIND 10
services.
<screen>
&gt; <userinput>config add Init/components b10-dhcp-ddns</userinput>
&gt; <userinput>config set Init/components/b10-dhcp-ddns/kind dispensable</userinput>
&gt; <userinput>config add Init/components kea-dhcp-ddns</userinput>
&gt; <userinput>config set Init/components/kea-dhcp-ddns/kind dispensable</userinput>
&gt; <userinput>config commit</userinput>
</screen>
</para>
<para>
To remove <command>b10-dhcp-ddns</command> from the set of running services,
the <command>b10-dhcp-ddns</command> is removed from list of Init components:
To remove <command>kea-dhcp-ddns</command> from the set of running services,
the <command>kea-dhcp-ddns</command> is removed from list of Init components:
<screen>
&gt; <userinput>config remove Init/components b10-dhcp-ddns</userinput>
&gt; <userinput>config remove Init/components kea-dhcp-ddns</userinput>
&gt; <userinput>config commit</userinput>
</screen>
</para>
......@@ -93,7 +93,7 @@
current configuration, use the following command in <command>bindctl</command>:
<screen>
&gt; <userinput>config show DhcpDdns</userinput></screen>
When starting b10-dhcp-ddns module for the first time, the default
When starting kea-dhcp-ddns module for the first time, the default
configuration will be available. It will look similar to this:
<screen>
&gt; <userinput>config show DhcpDdns</userinput>
......
doc/guide/dhcp4-srv.xml
View file @ 26174791
......@@ -13,23 +13,23 @@
<!-- @todo Rewrite this section once #3422 is done -->
<para>
<command>b10-dhcp4</command> is the Kea DHCPv4 server and is configured
<command>kea-dhcp4</command> is the Kea DHCPv4 server and is configured
through the <command>bindctl</command> program.
</para>
<para>
After starting <command>bind10</command> and entering bindctl, the first step
in configuring the server is to add it to the list of running services.
<screen>
&gt; <userinput>config add Init/components b10-dhcp4</userinput>
&gt; <userinput>config set Init/components/b10-dhcp4/kind dispensable</userinput>
&gt; <userinput>config add Init/components kea-dhcp4</userinput>
&gt; <userinput>config set Init/components/kea-dhcp4/kind dispensable</userinput>
&gt; <userinput>config commit</userinput>
</screen>
</para>
<para>
To remove <command>b10-dhcp4</command> from the set of running services,
the <command>b10-dhcp4</command> is removed from list of Init components:
To remove <command>kea-dhcp4</command> from the set of running services,
the <command>kea-dhcp4</command> is removed from list of Init components:
<screen>
&gt; <userinput>config remove Init/components b10-dhcp4</userinput>
&gt; <userinput>config remove Init/components kea-dhcp4</userinput>
&gt; <userinput>config commit</userinput>
</screen>
</para>
......@@ -1145,7 +1145,7 @@ temporarily override a list of interface names and listen on all interfaces.
<section id="dhcp4-ddns-config">
<title>Configuring DHCPv4 for DDNS</title>
<para>
As mentioned earlier, b10-dhcp4 can be configured to generate requests to the
As mentioned earlier, kea-dhcp4 can be configured to generate requests to the
DHCP-DDNS server to update DNS entries. These requests are known as
NameChangeRequests or NCRs. Each NCR contains the following information:
<orderedlist>
......@@ -1162,7 +1162,7 @@ temporarily override a list of interface names and listen on all interfaces.
</orderedlist>
The parameters for controlling the generation of NCRs for submission to the
DHCP-DDNS server
are contained in the <command>dhcp-ddns</command> section of the b10-dhcp4 server
are contained in the <command>dhcp-ddns</command> section of the kea-dhcp4 server
configuration. The default values for this section are as follows:
<screen>
"Dhcp4": {
......@@ -1187,7 +1187,7 @@ temporarily override a list of interface names and listen on all interfaces.
</para>
<!-- this paragraph no longer applies as we don't have default values
<para>
The "enable-updates" parameter determines whether or not b10-dhcp4 will
The "enable-updates" parameter determines whether or not kea-dhcp4 will
generate NCRs. By default, this value is false hence DDNS updates are
disabled. To enable DDNS updates set this value to true:
</para>
......@@ -1198,8 +1198,8 @@ temporarily override a list of interface names and listen on all interfaces.
<section id="dhcpv4-d2-io-config">
<title>DHCP-DDNS Server Connectivity</title>
<para>
In order for NCRs to reach the DHCP-DDNS server, b10-dhcp4 must be able
to communicate with it. b10-dhcp4 uses the following configuration
In order for NCRs to reach the DHCP-DDNS server, kea-dhcp4 must be able
to communicate with it. kea-dhcp4 uses the following configuration
parameters to control how it communications with DHCP-DDNS:
<orderedlist>
<listitem><para>
......@@ -1212,13 +1212,13 @@ temporarily override a list of interface names and listen on all interfaces.
is 53001.
</para></listitem>
<listitem><para>
<command>sender-ip</command> - IP address which b10-dhcp4 should use to send requests to the DHCP-DDNS server.
The default value is blank which instructs b10-dhcp4 to select a suitable
<command>sender-ip</command> - IP address which kea-dhcp4 should use to send requests to the DHCP-DDNS server.
The default value is blank which instructs kea-dhcp4 to select a suitable
address.
</para></listitem>
<listitem><para>
<command>sender-port</command> - port which b10-dhcp4 should use to send requests to the DHCP-DDNS server. The
default value of 0 instructs b10-dhcp4 to select suitable port.
<command>sender-port</command> - port which kea-dhcp4 should use to send requests to the DHCP-DDNS server. The
default value of 0 instructs kea-dhcp4 to select suitable port.
</para></listitem>
<listitem><para>
<command>ncr-format</command> - Socket protocol use when sending requests to the DHCP-DDNS server. Currently
......@@ -1235,12 +1235,12 @@ temporarily override a list of interface names and listen on all interfaces.
uncontrollably if they are being generated faster than they can be
delivered. If the number of requests queued for transmission reaches
this value, DDNS updating will be turned off until the queue backlog has
been sufficiently reduced. The intention is allow the b10-dhcp4 server to
been sufficiently reduced. The intention is allow the kea-dhcp4 server to
continue lease operations without running the risk that its memory usage
grows without limit. The default value is 1024.
</para></listitem>
</orderedlist>
By default, the DHCP-DDNS server is assumed to running on the same machine as b10-dhcp4, and
By default, the DHCP-DDNS server is assumed to running on the same machine as kea-dhcp4, and
all of the default values mentioned above should be sufficient.
If, however, the DHCP-DDNS server has been configured to listen on a different address or
port, these values must altered accordingly. For example, if the DHCP-DDNS server has been
......@@ -1259,19 +1259,19 @@ temporarily override a list of interface names and listen on all interfaces.
</para>
</section>
<section id="dhcpv4-d2-rules-config">
<title>When Does the b10-dhcp4 Server Generate DDNS Requests?</title>
<para>b10-dhcp4 follows the behavior prescribed for DHCP servers in
<title>When Does the kea-dhcp4 Server Generate DDNS Requests?</title>
<para>kea-dhcp4 follows the behavior prescribed for DHCP servers in
<ulink url="http://tools.ietf.org/html/rfc4702">RFC 4702</ulink>.
It is important to keep in mind that b10-dhcp4 provides the initial decision
It is important to keep in mind that kea-dhcp4 provides the initial decision
making of when and what to update and forwards that information to the DHCP-DDNS server in
the form of NCRs. Carrying out the actual DNS updates and dealing with
such things as conflict resolution are within the purview of the DHCP-DDNS server itself (<xref linkend="dhcp-ddns-server"/>).
This section describes when b10-dhcp4 will generate NCRs and the
This section describes when kea-dhcp4 will generate NCRs and the
configuration parameters that can be used to influence this decision.
It assumes that the "enable-updates" parameter is true.
</para>
<para>
In general, b10-dhcp4 will generate DDNS update requests when:
In general, kea-dhcp4 will generate DDNS update requests when:
<orderedlist>
<listitem><para>
A new lease is granted in response to a DHCP REQUEST
......@@ -1292,10 +1292,10 @@ temporarily override a list of interface names and listen on all interfaces.
involved and is discussed next.
</para>
<para>
When a new lease is granted, b10-dhcp4 will generate a DDNS
When a new lease is granted, kea-dhcp4 will generate a DDNS
update request if the DHCP REQUEST contains either the FQDN option
(code 81) or the Host Name option (code 12). If both are present,
the server will use the FQDN option. By default b10-dhcp4
the server will use the FQDN option. By default kea-dhcp4
will respect the FQDN N and S flags specified by the client as shown
in the following table:
</para>
......@@ -1341,11 +1341,11 @@ temporarily override a list of interface names and listen on all interfaces.
<para>
The first row in the table above represents "client delegation". Here
the DHCP client states that it intends to do the forward DNS updates and
the server should do the reverse updates. By default, b10-dhcp4 will honor
the server should do the reverse updates. By default, kea-dhcp4 will honor
the client's wishes and generate a DDNS request to the DHCP-DDNS server to update only
reverse DNS data. The parameter <command>override-client-update</command> can be used
to instruct the server to override client delegation requests. When
this parameter is true, b10-dhcp4 will disregard requests for client
this parameter is true, kea-dhcp4 will disregard requests for client
delegation and generate a DDNS request to update both forward and
reverse DNS data. In this case, the N-S-O flags in the server's
response to the client will be 0-1-1 respectively.
......@@ -1353,7 +1353,7 @@ temporarily override a list of interface names and listen on all interfaces.
<para>
(Note that the flag combination N=1, S=1 is prohibited according to
<ulink utl="http://tools.ietf.org/html/rfc4702">RFC 4702</ulink>. If such a combination is received from the client, the packet
will be dropped by b10-dhcp4.)
will be dropped by kea-dhcp4.)
</para>
<para>
To override client delegation, set the following values in your configuration
......@@ -1372,7 +1372,7 @@ temporarily override a list of interface names and listen on all interfaces.
The third row in the table above describes the case in which the client
requests that no DNS updates be done. The parameter, <command>override-no-update</command>,
can be used to instruct the server to disregard the client's wishes. When
this parameter is true, b10-dhcp4 will generate DDNS update request to the DHCP-DDNS server
this parameter is true, kea-dhcp4 will generate DDNS update request to the DHCP-DDNS server
even if the client requests that no updates be done. The N-S-O flags in the
server's response to the client will be 0-1-1.
</para>
......@@ -1389,7 +1389,7 @@ temporarily override a list of interface names and listen on all interfaces.
}
</screen>
<para>
b10-dhcp4 will always generate DDNS update requests if the client request
kea-dhcp4 will always generate DDNS update requests if the client request
only contains the Host Name option. In addition it will include an FQDN
option in the response to the client with the FQDN N-S-O flags set to
0-1-0 respectively. The domain name portion of the FQDN option will be
......@@ -1397,9 +1397,9 @@ temporarily override a list of interface names and listen on all interfaces.
</para>
</section>
<section id="dhcpv4-fqdn-name-generation">
<title>b10-dhcp4 name generation for DDNS update requests</title>
<title>kea-dhcp4 name generation for DDNS update requests</title>
Each NameChangeRequest must of course include the fully qualified domain
name whose DNS entries are to be affected. b10-dhcp4 can be configured to
name whose DNS entries are to be affected. kea-dhcp4 can be configured to
supply a portion or all of that name based upon what it receives from
the client in the DHCP REQUEST.
<para>
......@@ -1428,7 +1428,7 @@ temporarily override a list of interface names and listen on all interfaces.
</orderedlist>
</para></listitem>
</orderedlist>
To instruct b10-dhcp4 to always generate the FQDN for a client, set the
To instruct kea-dhcp4 to always generate the FQDN for a client, set the
parameter <command>replace-client-name</command> to true as follows:
</para>
<screen>
......@@ -1471,7 +1471,7 @@ temporarily override a list of interface names and listen on all interfaces.
</screen>
</section>
<para>
When generating a name, b10-dhcp4 will construct name of the format:
When generating a name, kea-dhcp4 will construct name of the format:
</para>
<para>
[generated-prefix]-[address-text].[qualifying-suffix].
......@@ -1545,7 +1545,7 @@ temporarily override a list of interface names and listen on all interfaces.
</screen>
</section>
</section> <!-- end of configuring b10-dhcp4 server section with many subsections -->
</section> <!-- end of configuring kea-dhcp4 server section with many subsections -->
<section id="dhcp4-serverid">
<title>Server Identifier in DHCPv4</title>
......
doc/guide/dhcp6-srv.xml
View file @ 26174791
......@@ -16,18 +16,18 @@
</para>
<para>
After starting <command>bind10</command> and starting <command>bindctl</command>, the first step
in configuring the server is to add <command>b10-dhcp6</command> to the list of running services.
in configuring the server is to add <command>kea-dhcp6</command> to the list of running services.
<screen>
&gt; <userinput>config add Init/components b10-dhcp6</userinput>
&gt; <userinput>config set Init/components/b10-dhcp6/kind dispensable</userinput>
&gt; <userinput>config add Init/components kea-dhcp6</userinput>
&gt; <userinput>config set Init/components/kea-dhcp6/kind dispensable</userinput>
&gt; <userinput>config commit</userinput>
</screen>
</para>
<para>
To remove <command>b10-dhcp6</command> from the set of running services,
the <command>b10-dhcp6</command> is removed from list of Init components:
To remove <command>kea-dhcp6</command> from the set of running services,
the <command>kea-dhcp6</command> is removed from list of Init components:
<screen>
&gt; <userinput>config remove Init/components b10-dhcp6</userinput>
&gt; <userinput>config remove Init/components kea-dhcp6</userinput>
&gt; <userinput>config commit</userinput>
</screen>
</para>
......@@ -1014,7 +1014,7 @@ should include options from the isc option space:
<section id="dhcp6-ddns-config">
<title>Configuring DHCPv6 for DDNS</title>
<para>
As mentioned earlier, b10-dhcp6 can be configured to generate requests to
As mentioned earlier, kea-dhcp6 can be configured to generate requests to
the DHCP-DDNS server (referred to here as the "D2" server) to update
DNS entries. These requests are known as NameChangeRequests or NCRs.
Each NCR contains the following information:
......@@ -1031,7 +1031,7 @@ should include options from the isc option space:
</para></listitem>
</orderedlist>
The parameters controlling the generation of NCRs for submission to D2
are contained in the "dhcp-ddns" section of b10-dhcp6
are contained in the "dhcp-ddns" section of kea-dhcp6
configuration. The default values for this section appears as follows:
<screen>
&gt; <userinput>config show Dhcp6/dhcp-ddns</userinput>
......@@ -1051,7 +1051,7 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
</screen>
</para>
<para>
The "enable-updates" parameter determines whether or not b10-dhcp6 will
The "enable-updates" parameter determines whether or not kea-dhcp6 will
generate NCRs. By default, this value is false hence DDNS updates are
disabled. To enable DDNS updates set this value to true as follows:
</para>
......@@ -1062,8 +1062,8 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
<section id="dhcpv6-d2-io-config">
<title>DHCP-DDNS Server Connectivity</title>
<para>
In order for NCRs to reach the D2 server, b10-dhcp6 must be able
to communicate with it. b10-dhcp6 uses the following configuration
In order for NCRs to reach the D2 server, kea-dhcp6 must be able
to communicate with it. kea-dhcp6 uses the following configuration
parameters to control how it communications with D2:
<orderedlist>
<listitem><para>
......@@ -1076,13 +1076,13 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
is 53001.
</para></listitem>
<listitem><para>
sender-ip - IP address which b10-dhcp6 should use to send requests to D2.
The default value is blank which instructs b10-dhcp6 to select a suitable
sender-ip - IP address which kea-dhcp6 should use to send requests to D2.
The default value is blank which instructs kea-dhcp6 to select a suitable
address.
</para></listitem>
<listitem><para>
sender-port - port which b10-dhcp6 should use to send requests to D2. The
default value of 0 instructs b10-dhcp6 to select suitable port.
sender-port - port which kea-dhcp6 should use to send requests to D2. The
default value of 0 instructs kea-dhcp6 to select suitable port.
</para></listitem>
<listitem><para>
ncr-format - Socket protocol use when sending requests to D2. Currently
......@@ -1099,11 +1099,11 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
uncontrollably if they are being generated faster than they can be
delivered. If the number of requests queued for transmission reaches
this value, DDNS updating will be turned off until the queue backlog has
been sufficiently reduced. The intent is allow b10-dhcp6 to
been sufficiently reduced. The intent is allow kea-dhcp6 to
continue lease operations. The default value is 1024.
</para></listitem>
</orderedlist>
By default, D2 is assumed to running on the same machine as b10-dhcp6, and
By default, D2 is assumed to running on the same machine as kea-dhcp6, and
all of the default values mentioned above should be sufficient.
If, however, D2 has been configured to listen on a different address or
port, these values must altered accordingly. For example, if D2 has been
......@@ -1117,28 +1117,28 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
</para>
</section>
<section id="dhcpv6-d2-rules-config">
<title>When does b10-dhcp6 generate DDNS request</title>
b10-dhcp6 follows the behavior prescribed for DHCP servers in RFC 4704.
It is important to keep in mind that b10-dhcp6 provides the initial decision
<title>When does kea-dhcp6 generate DDNS request</title>
kea-dhcp6 follows the behavior prescribed for DHCP servers in RFC 4704.
It is important to keep in mind that kea-dhcp6 provides the initial decision
making of when and what to update and forwards that information to D2 in
the form of NCRs. Carrying out the actual DNS updates and dealing with
such things as conflict resolution are the purview of D2 (<xref linkend="dhcp-ddns-server"/>).
<para>
This section describes when b10-dhcp6 will generate NCRs and the
This section describes when kea-dhcp6 will generate NCRs and the
configuration parameters that can be used to influence this decision.
It assumes that the "enable-updates" parameter is true.
</para>
<note>
<para>
Currently the interface between b10-dhcp6 and D2 only supports requests
Currently the interface between kea-dhcp6 and D2 only supports requests
which update DNS entries for a single IP address. If a lease grants
more than one address, b10-dhcp6 will create the DDNS update request for
more than one address, kea-dhcp6 will create the DDNS update request for
only the first of these addresses. Support for multiple address
mappings may be provided in a future release.
</para>
</note>
<para>
In general, b10-dhcp6 will generate DDNS update requests when:
In general, kea-dhcp6 will generate DDNS update requests when:
<orderedlist>
<listitem><para>
A new lease is granted in response to a DHCP REQUEST
......@@ -1159,8 +1159,8 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
discussed next.
</para>
<para>
b10-dhcp6 will generate a DDNS update request only if the DHCP REQUEST
contains the FQDN option (code 39). By default b10-dhcp6 will
kea-dhcp6 will generate a DDNS update request only if the DHCP REQUEST
contains the FQDN option (code 39). By default kea-dhcp6 will
respect the FQDN N and S flags specified by the client as shown in the
following table:
</para>
......@@ -1206,11 +1206,11 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
<para>
The first row in the table above represents "client delegation". Here
the DHCP client states that it intends to do the forward DNS updates and
the server should do the reverse updates. By default, b10-dhcp6 will honor
the server should do the reverse updates. By default, kea-dhcp6 will honor
the client's wishes and generate a DDNS request to D2 to update only
reverse DNS data. The parameter, "override-client-update", can be used
to instruct the server to override client delegation requests. When
this parameter is true, b10-dhcp6 will disregard requests for client
this parameter is true, kea-dhcp6 will disregard requests for client
delegation and generate a DDNS request to update both forward and
reverse DNS data. In this case, the N-S-O flags in the server's
response to the client will be 0-1-1 respectively.
......@@ -1218,7 +1218,7 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
<para>
(Note that the flag combination N=1, S=1 is prohibited according to
RFC 4702. If such a combination is received from the client, the packet
will be dropped by b10-dhcp6.)
will be dropped by kea-dhcp6.)
</para>
<para>
To override client delegation, issue the following commands:
......@@ -1231,7 +1231,7 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
The third row in the table above describes the case in which the client
requests that no DNS updates be done. The parameter, "override-no-update",
can be used to instruct the server to disregard the client's wishes. When
this parameter is true, b10-dhcp6 will generate DDNS update request to D2
this parameter is true, kea-dhcp6 will generate DDNS update request to D2
even if the client requests no updates be done. The N-S-O flags in the
server's response to the client will be 0-1-1.
</para>
......@@ -1244,9 +1244,9 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
</screen>
</section>
<section id="dhcpv6-fqdn-name-generation">
<title>b10-dhcp6 name generation for DDNS update requests</title>
<title>kea-dhcp6 name generation for DDNS update requests</title>
Each NameChangeRequest must of course include the fully qualified domain
name whose DNS entries are to be affected. b10-dhcp6 can be configured to
name whose DNS entries are to be affected. kea-dhcp6 can be configured to
supply a portion or all of that name based upon what it receives from
the client in the DHCP REQUEST.
<para>
......@@ -1274,7 +1274,7 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
</orderedlist>
</para></listitem>
</orderedlist>
To instruct b10-dhcp6 to always generate a FQDN, set the parameter
To instruct kea-dhcp6 to always generate a FQDN, set the parameter
"replace-client-name" to true:
</para>
<screen>
......@@ -1302,7 +1302,7 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
</screen>
</section>
<para>
When qualifying a partial name, b10-dhcp6 will construct a name with the
When qualifying a partial name, kea-dhcp6 will construct a name with the
format:
</para>
<para>
......@@ -1317,7 +1317,7 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
some-computer.example.com.
</para>
<para>
When generating a the entire name, b10-dhcp6 will construct name of the
When generating a the entire name, kea-dhcp6 will construct name of the
format:
</para>
<para>
......@@ -1351,7 +1351,7 @@ Dhcp6/dhcp-ddns/qualifying-suffix "example.com" string
<para>
It is unlikely that this parameter should ever need to be changed.
However, if such a need arises, stop the server, edit the file and restart
the server. (The file is named b10-dhcp6-serverid and by default is
the server. (The file is named kea-dhcp6-serverid and by default is
stored in the "var" subdirectory of the directory in which BIND 10 is installed.
This can be changed when BIND 10 is built by using "--localstatedir"
on the "configure" command line.) The file is a text file that contains
......
doc/guide/intro.xml
View file @ 26174791
......@@ -164,7 +164,7 @@
<listitem>
<simpara>
<command>b10-dhcp4</command> &mdash;
<command>kea-dhcp4</command> &mdash;
DHCPv4 server process.
This process responds to DHCPv4 queries from clients.
</simpara>
......@@ -172,7 +172,7 @@
<listitem>
<simpara>
<command>b10-dhcp6</command> &mdash;
<command>kea-dhcp6</command> &mdash;
DHCPv6 server process.
This process responds to DHCPv6 queries from clients.
</simpara>
......@@ -180,7 +180,7 @@
<listitem>
<simpara>
<command>b10-dhcp-ddns</command> &mdash;
<command>kea-dhcp-ddns</command> &mdash;
DHCP-DDNS process.
This process acts as an intermediary between the DHCP servers
and DNS server. It receives name update requests from the DHCP
......
doc/guide/logging.xml
View file @ 26174791
......@@ -134,7 +134,7 @@ Right now you can only see what their names are if they are running
name replaced by the name of the process implementing
the module (so for example, a message generated by the
<quote>Dhcp4</quote> logger will appear in the output
with a logger name of <quote>b10-dhcp4</quote>).
with a logger name of <quote>kea-dhcp4</quote>).
</para>
......@@ -646,7 +646,7 @@ Logging/loggers[0]/output_options[0]/maxver 8 integer (modified)
<para>
Consider the message below logged to a file:
<screen>2014-04-11 12:58:01.005 INFO [b10-dhcp4.dhcpsrv/27456]
<screen>2014-04-11 12:58:01.005 INFO [kea-dhcp4.dhcpsrv/27456]
DHCPSRV_MEMFILE_DB opening memory file lease database: type=memfile universe=4</screen>
</para>
......@@ -677,11 +677,11 @@ Logging/loggers[0]/output_options[0]/maxver 8 integer (modified)
</varlistentry>
<varlistentry>
<term>[b10-dhcp4.dhcpsrv/27456]</term>
<term>[kea-dhcp4.dhcpsrv/27456]</term>
<listitem><para>
The source of the message. This comprises two components:
the BIND 10 process generating the message (in this
case, <command>b10-dhcp4</command>) and the module
case, <command>kea-dhcp4</command>) and the module
within the program from which the message originated
(which is the name of the common library used by DHCP server
implementations).
......
doc/guide/quickstart.xml
View file @ 26174791
......@@ -57,7 +57,7 @@ $ <userinput>./configure [your extra parameters]</userinput></screen>
<listitem>
<para>If you wish to run a DHCP server for IPv4, you need to set up and start
the b10-dhcp4 server:</para>
the kea-dhcp4 server:</para>
<orderedlist>
<listitem>
<para>Edit your configuration file for DHCPv4. <xref linkend="dhcp4-configuration"/>
......@@ -67,7 +67,7 @@ $ <userinput>./configure [your extra parameters]</userinput></screen>
<listitem>
<para>Start Kea DHCPv4 server (as root):
<screen># <userinput>b10-dhcp4 -c /path/to/your/kea4/config/file.json</userinput></screen>
<screen># <userinput>kea-dhcp4 -c /path/to/your/kea4/config/file.json</userinput></screen>
</para>
</listitem>
......@@ -84,7 +84,7 @@ $ <userinput>./configure [your extra parameters]</userinput></screen>
<listitem>
<para>If you wish to run a DHCP server for IPv6, you need to set up and start
the b10-dhcp6 server:</para>
the kea-dhcp6 server:</para>
<orderedlist>
<listitem>
<para>Edit your configuration file for DHCPv6. <xref linkend="dhcp6-configuration"/>
......@@ -94,7 +94,7 @@ $ <userinput>./configure [your extra parameters]</userinput></screen>
<listitem>
<para>Start Kea DHCPv6 server (as root):
<screen># <userinput>b10-dhcp6 -c /path/to/your/kea6/config/file.json</userinput></screen>
<screen># <userinput>kea-dhcp6 -c /path/to/your/kea6/config/file.json</userinput></screen>
</para>
</listitem>
......
src/bin/d2/d2_log.cc
View file @ 26174791
......@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
/// Defines the logger used by the top-level component of b10-d2.
/// Defines the logger used by the top-level component of kea-dhcp-ddns.
#include <d2/d2_log.h>
......
src/bin/dhcp4/dhcp4_log.h
View file @ 26174791
......@@ -25,7 +25,7 @@ namespace dhcp {
/// \brief DHCP4 Logging
///
/// Defines the levels used to output debug messages in the non-library part of
/// the b10-dhcp4 program. Higher numbers equate to more verbose (and detailed)
/// the kea-dhcp4 program. Higher numbers equate to more verbose (and detailed)
/// output.
// Debug levels used to log information during startup and shutdown.
......
src/bin/dhcp6/dhcp6_log.cc
View file @ 26174791
......@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
/// Defines the logger used by the top-level component of b10-dhcp6.
/// Defines the logger used by the top-level component of kea-dhcp6.
#include <dhcp6/dhcp6_log.h>
......
src/bin/dhcp6/dhcp6_srv.cc
View file @ 26174791
......@@ -112,7 +112,7 @@ const std::string Dhcpv6Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_");
/// double digit hex values separated by colons format, e.g.
/// 01:ff:02:03:06:80:90:ab:cd:ef. Server will create it during first
/// run and then use it afterwards.
static const char* SERVER_DUID_FILE = "b10-dhcp6-serverid";
static const char* SERVER_DUID_FILE = "kea-dhcp6-serverid";
Dhcpv6Srv::Dhcpv6Srv(uint16_t port)
:alloc_engine_(), serverid_(), port_(port), shutdown_(true)
......@@ -2624,7 +2624,7 @@ Dhcpv6Srv::d2ClientErrorHandler(const
dhcp_ddns::NameChangeRequestPtr& ncr) {
LOG_ERROR(dhcp6_logger, DHCP6_DDNS_REQUEST_SEND_FAILED).
arg(result).arg((ncr ? ncr->toText() : " NULL "));
// We cannot communicate with b10-dhcp-ddns, suspend futher updates.
// We cannot communicate with kea-dhcp-ddns, suspend futher updates.
/// @todo We may wish to revisit this, but for now we will simpy turn
/// them off.
CfgMgr::instance().getD2ClientMgr().suspendUpdates();
......
src/bin/dhcp6/main.cc
View file @ 26174791
......@@ -37,7 +37,7 @@ using namespace std;
/// Dhcpv6Srv and other classes, see \ref dhcpv6Session.
namespace {
const char* const DHCP6_NAME = "b10-dhcp6";
const char* const DHCP6_NAME = "kea-dhcp6";
const char* const DHCP6_LOGGER_NAME = "kea";
......
src/hooks/dhcp/user_chk/libdhcp_user_chk.dox
View file @ 26174791
......@@ -18,7 +18,7 @@
@section libdhcp_user_chkIntro Libdhcp_user_chk: An Example Hooks Library
## Introduction
libdhcp_user_chk is an example hooks library which customizes the DHCP query
processing provided by BIND X DHCP server modules (b10-dhcp4 and b10-dhcp6).
processing provided by Kea DHCP server modules (kea-dhcp4 and kea-dhcp6).
Specifically it allows subnet selection and DHCP response option customization
based upon a registry of DHCP clients. Note that the words "client" and "user" are used interchangeably herein. The intent of the custom behavior is three
fold:
......@@ -134,7 +134,7 @@ config set Dhcp4/hook_libraries[0] "/usr/local/lib/libdhcp_user_chk.so"
config commit
@endcode
To configure it for b10-dhcp6, the commands are simply as shown below:
To configure it for kea-dhcp6, the commands are simply as shown below:
@code