[master] Merge branch 'trac3414'

doc/guide/ddns.xml

@@ -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

@@ -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

@@ -11,23 +11,23 @@
       <title>Starting and Stopping the DHCPv6 Server</title>
 
       <para>
-        <command>b10-dhcp6</command> is the Kea DHCPv6 server and is configured
+        <command>kea-dhcp6</command> is the Kea DHCPv6 server and is configured
         through the <command>bindctl</command> program.
       </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

@@ -139,7 +139,7 @@
 	a master process, <command>b10-init</command>, which will
 	start other required processes and other processes when
 	configured.  The processes that may be started have names
-	starting with "b10-", including:
+	starting with "kea-", including:
       </para>
 
       <para>
@@ -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
@@ -199,7 +199,7 @@
 
           <listitem>
             <simpara>
-              <command>b10-sockcreator</command> &mdash;
+              <command>kea-sockcreator</command> &mdash;
               Socket creator daemon.
               This process creates sockets used by
               network-listening BIND 10 processes.

doc/guide/logging.xml

@@ -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

@@ -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/.gitignore

@@ -1,5 +1,5 @@
-/b10-dhcp-ddns
-/b10-dhcp-ddns.8
+/kea-dhcp-ddns
+/kea-dhcp-ddns.8
 /d2_messages.cc
 /d2_messages.h
 /spec_config.h

src/bin/d2/Makefile.am

@@ -14,19 +14,17 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-
 CLEANFILES  = *.gcno *.gcda spec_config.h d2_messages.h d2_messages.cc s-messages
 
-man_MANS = b10-dhcp-ddns.8
+man_MANS = kea-dhcp-ddns.8
 DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) b10-dhcp-ddns.xml dhcp-ddns.spec
+EXTRA_DIST = $(man_MANS) kea-dhcp-ddns.xml dhcp-ddns.spec
 
 if GENERATE_DOCS
-b10-dhcp-ddns.8: b10-dhcp-ddns.xml
+kea-dhcp-ddns.8: kea-dhcp-ddns.xml
 	@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/b10-dhcp-ddns.xml
+	$(srcdir)/kea-dhcp-ddns.xml
 
 else
 
@@ -47,52 +45,52 @@ s-messages: d2_messages.mes
 
 BUILT_SOURCES = spec_config.h d2_messages.h d2_messages.cc
 
-pkglibexec_PROGRAMS = b10-dhcp-ddns
-
-b10_dhcp_ddns_SOURCES  = main.cc
-b10_dhcp_ddns_SOURCES += d_process.h
-b10_dhcp_ddns_SOURCES += d_controller.cc d_controller.h
-b10_dhcp_ddns_SOURCES += d_cfg_mgr.cc d_cfg_mgr.h
-b10_dhcp_ddns_SOURCES += d2_asio.h
-b10_dhcp_ddns_SOURCES += d2_log.cc d2_log.h
-b10_dhcp_ddns_SOURCES += d2_process.cc d2_process.h
-b10_dhcp_ddns_SOURCES += d2_config.cc d2_config.h
-b10_dhcp_ddns_SOURCES += d2_cfg_mgr.cc d2_cfg_mgr.h
-b10_dhcp_ddns_SOURCES += d2_queue_mgr.cc d2_queue_mgr.h
-b10_dhcp_ddns_SOURCES += d2_update_message.cc d2_update_message.h
-b10_dhcp_ddns_SOURCES += d2_update_mgr.cc d2_update_mgr.h
-b10_dhcp_ddns_SOURCES += d2_zone.cc d2_zone.h
-b10_dhcp_ddns_SOURCES += dns_client.cc dns_client.h
-b10_dhcp_ddns_SOURCES += io_service_signal.cc io_service_signal.h
-b10_dhcp_ddns_SOURCES += labeled_value.cc labeled_value.h
-b10_dhcp_ddns_SOURCES += nc_add.cc nc_add.h
-b10_dhcp_ddns_SOURCES += nc_remove.cc nc_remove.h
-b10_dhcp_ddns_SOURCES += nc_trans.cc nc_trans.h
-b10_dhcp_ddns_SOURCES += state_model.cc state_model.h
+sbin_PROGRAMS = kea-dhcp-ddns
+
+kea_dhcp_ddns_SOURCES  = main.cc
+kea_dhcp_ddns_SOURCES += d_process.h
+kea_dhcp_ddns_SOURCES += d_controller.cc d_controller.h
+kea_dhcp_ddns_SOURCES += d_cfg_mgr.cc d_cfg_mgr.h
+kea_dhcp_ddns_SOURCES += d2_asio.h
+kea_dhcp_ddns_SOURCES += d2_log.cc d2_log.h
+kea_dhcp_ddns_SOURCES += d2_process.cc d2_process.h
+kea_dhcp_ddns_SOURCES += d2_config.cc d2_config.h
+kea_dhcp_ddns_SOURCES += d2_cfg_mgr.cc d2_cfg_mgr.h
+kea_dhcp_ddns_SOURCES += d2_queue_mgr.cc d2_queue_mgr.h
+kea_dhcp_ddns_SOURCES += d2_update_message.cc d2_update_message.h
+kea_dhcp_ddns_SOURCES += d2_update_mgr.cc d2_update_mgr.h
+kea_dhcp_ddns_SOURCES += d2_zone.cc d2_zone.h
+kea_dhcp_ddns_SOURCES += dns_client.cc dns_client.h
+kea_dhcp_ddns_SOURCES += io_service_signal.cc io_service_signal.h
+kea_dhcp_ddns_SOURCES += labeled_value.cc labeled_value.h
+kea_dhcp_ddns_SOURCES += nc_add.cc nc_add.h
+kea_dhcp_ddns_SOURCES += nc_remove.cc nc_remove.h
+kea_dhcp_ddns_SOURCES += nc_trans.cc nc_trans.h
+kea_dhcp_ddns_SOURCES += state_model.cc state_model.h
 
 if CONFIG_BACKEND_BUNDY
-b10_dhcp_ddns_SOURCES += bundy_d2_controller.cc bundy_d2_controller.h
+kea_dhcp_ddns_SOURCES += bundy_d2_controller.cc bundy_d2_controller.h
 else
 if CONFIG_BACKEND_JSON
-b10_dhcp_ddns_SOURCES += d2_controller.cc d2_controller.h
+kea_dhcp_ddns_SOURCES += d2_controller.cc d2_controller.h
 endif
 endif
 
-nodist_b10_dhcp_ddns_SOURCES = d2_messages.h d2_messages.cc
+nodist_kea_dhcp_ddns_SOURCES = d2_messages.h d2_messages.cc
 EXTRA_DIST += d2_messages.mes
 
-b10_dhcp_ddns_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-
-b10_dhcp_ddnsdir = $(pkgdatadir)
-b10_dhcp_ddns_DATA = dhcp-ddns.spec
+kea_dhcp_ddns_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+
+kea_dhcp_ddnsdir = $(pkgdatadir)
+kea_dhcp_ddns_DATA = dhcp-ddns.spec

src/bin/d2/bundy_d2_controller.cc

@@ -26,7 +26,7 @@ namespace d2 {
 const char* D2Controller::d2_app_name_ = "DHCP-DDNS";
 
 /// @brief Defines the executable name. This is passed into the base class
-const char* D2Controller::d2_bin_name_ = "b10-dhcp-ddns";
+const char* D2Controller::d2_bin_name_ = "kea-dhcp-ddns";
 
 DControllerBasePtr&
 D2Controller::instance() {

src/bin/d2/d2_controller.cc

@@ -26,7 +26,7 @@ namespace d2 {
 const char* D2Controller::d2_app_name_ = "DhcpDdns";
 
 /// @brief Defines the executable name. This is passed into the base class
-const char* D2Controller::d2_bin_name_ = "b10-dhcp-ddns";
+const char* D2Controller::d2_bin_name_ = "kea-dhcp-ddns";
 
 DControllerBasePtr&
 D2Controller::instance() {

src/bin/d2/d2_log.cc

@@ -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/d2/dhcp-ddns.spec

@@ -205,7 +205,7 @@
     "commands": [
         {
             "command_name": "shutdown",
-            "command_description": "Shuts down b10-dhcp-ddns module server.",
+            "command_description": "Shuts down kea-dhcp-ddns module server.",
             "command_args": [
             {
                 "item_name": "type",

src/bin/d2/b10-dhcp-ddns.xml

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2013, 2014  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
@@ -20,37 +20,37 @@
 <refentry>
 
   <refentryinfo>
-    <date>May 15, 2013</date>
+    <date>July 1, 2014</date>
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>b10-dhcp-ddns</refentrytitle>
+    <refentrytitle>kea-dhcp-ddns</refentrytitle>
     <manvolnum>8</manvolnum>
-    <refmiscinfo>BIND10</refmiscinfo>
+    <refmiscinfo>Kea</refmiscinfo>
   </refmeta>
 
   <refnamediv>
-    <refname>b10-dhcp-ddns</refname>
-    <refpurpose>DHCP-DDNS process in BIND 10 architecture</refpurpose>
+    <refname>kea-dhcp-ddns</refname>
+    <refpurpose>DHCP-DDNS process in Kea</refpurpose>
   </refnamediv>
 
   <docinfo>
     <copyright>
-      <year>2013</year>
+      <year>2014</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>b10-dhcp-ddns</command>
+      <command>kea-dhcp-ddns</command>
       <arg><option>-v</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>b10-dhcp-ddns</command>
+      <command>kea-dhcp-ddns</command>
       <arg><option>-s</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -59,9 +59,9 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      The <command>b10-dhcp-ddns</command> service processes requests to
+      The <command>kea-dhcp-ddns</command> service processes requests to
       to update DNS mapping based on DHCP lease change events. The service
-      may run either as a BIND10 module (integrated mode) or as a individual
+      may run either as a Kea module (integrated mode) or as a individual
       process (stand-alone mode) dependent upon command line arguments. The
       default is integrated mode.  Stand alone operation is strictly for
       development purposes and is not suited for production.
@@ -85,10 +85,10 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-s</option></term>
+        <term><option>-c</option></term>
         <listitem><para>
-          Causes the process to run without attempting to connect to the
-          BIND10 message queue.  This is for development purposes.
+          Configuration file including the configuration for DHCP-DDNS server.
+          It may also contain configuration entries for other Kea services.
         </para></listitem>
       </varlistentry>
 
@@ -96,22 +96,15 @@
   </refsect1>
 
   <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-      <citerefentry>
-        <refentrytitle>b10-dhcp-ddns</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-        <refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>.
-    </para>
-  </refsect1>
-
-  <refsect1>
     <title>HISTORY</title>
     <para>
       The <command>b10-dhcp-ddns</command> process was first coded in
-      May 2013 by the ISC Kea/Dhcp team.
+      May 2013 by the ISC Kea/DHCP team.
+    </para>
+    <para>
+      Kea became a standalone server and the BIND10 framework was
+      removed. The DHCP-DDNS server binary was renamed to kea-dhcp-ddns
+      in July 2014.
     </para>
   </refsect1>
 </refentry><!--

src/bin/d2/main.cc

@@ -25,7 +25,7 @@ using namespace isc::d2;
 using namespace std;
 
 /// This file contains entry point (main() function) for standard DHCP-DDNS
-/// process, b10-dhcp-ddns, component for BIND10 framework.  It fetches
+/// process, kea-dhcp-ddns, component for BIND10 framework.  It fetches
 /// the D2Controller singleton instance and invokes its launch method.
 /// The exit value of the program will be EXIT_SUCCESS if there were no
 /// errors, EXIT_FAILURE otherwise.

src/bin/d2/tests/d2_process_tests.sh.in

@@ -42,7 +42,7 @@ CONFIG_INVALID="{
 }"
 
 # Set the location of the executable.
-bin="b10-dhcp-ddns"
+bin="kea-dhcp-ddns"
 bin_path=@abs_top_builddir@/src/bin/d2
 
 # Import common test library.

src/bin/dhcp4/.gitignore

@@ -1,5 +1,5 @@
-/b10-dhcp4
-/b10-dhcp4.8
+/kea-dhcp4
+/kea-dhcp4.8
 /dhcp4_messages.cc
 /dhcp4_messages.h
 /spec_config.h

src/bin/dhcp4/Makefile.am

@@ -14,19 +14,17 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-
 CLEANFILES  = *.gcno *.gcda spec_config.h dhcp4_messages.h dhcp4_messages.cc s-messages
 
-man_MANS = b10-dhcp4.8
+man_MANS = kea-dhcp4.8
 DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) b10-dhcp4.xml dhcp4.spec
+EXTRA_DIST = $(man_MANS) kea-dhcp4.xml dhcp4.spec
 
 if GENERATE_DOCS
-b10-dhcp4.8: b10-dhcp4.xml
+kea-dhcp4.8: kea-dhcp4.xml
 	@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/b10-dhcp4.xml
+	$(srcdir)/kea-dhcp4.xml
 
 else
 
@@ -47,35 +45,35 @@ s-messages: dhcp4_messages.mes
 
 BUILT_SOURCES = spec_config.h dhcp4_messages.h dhcp4_messages.cc
 
-pkglibexec_PROGRAMS = b10-dhcp4
+sbin_PROGRAMS = kea-dhcp4
 
-b10_dhcp4_SOURCES  = main.cc
-b10_dhcp4_SOURCES += ctrl_dhcp4_srv.cc ctrl_dhcp4_srv.h
-b10_dhcp4_SOURCES += json_config_parser.cc json_config_parser.h
-b10_dhcp4_SOURCES += dhcp4_log.cc dhcp4_log.h
-b10_dhcp4_SOURCES += dhcp4_srv.cc dhcp4_srv.h
+kea_dhcp4_SOURCES  = main.cc
+kea_dhcp4_SOURCES += ctrl_dhcp4_srv.cc ctrl_dhcp4_srv.h
+kea_dhcp4_SOURCES += json_config_parser.cc json_config_parser.h
+kea_dhcp4_SOURCES += dhcp4_log.cc dhcp4_log.h
+kea_dhcp4_SOURCES += dhcp4_srv.cc dhcp4_srv.h
 
 if CONFIG_BACKEND_BUNDY
-b10_dhcp4_SOURCES += bundy_controller.cc
+kea_dhcp4_SOURCES += bundy_controller.cc
 endif
 
 if CONFIG_BACKEND_JSON
-b10_dhcp4_SOURCES += kea_controller.cc
+kea_dhcp4_SOURCES += kea_controller.cc
 endif
 
-nodist_b10_dhcp4_SOURCES = dhcp4_messages.h dhcp4_messages.cc
+nodist_kea_dhcp4_SOURCES = dhcp4_messages.h dhcp4_messages.cc
 EXTRA_DIST += dhcp4_messages.mes
 
-b10_dhcp4_LDADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-
-b10_dhcp4dir = $(pkgdatadir)
-b10_dhcp4_DATA = dhcp4.spec
+kea_dhcp4_LDADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+
+kea_dhcp4dir = $(pkgdatadir)
+kea_dhcp4_DATA = dhcp4.spec

src/bin/dhcp4/dhcp4.dox

@@ -16,7 +16,7 @@
  @page dhcp4 DHCPv4 Server Component
 
 BIND10 offers DHCPv4 server implementation. It is implemented as
-b10-dhcp4 component.  Its primary code is located in
+kea-dhcp4 component.  Its primary code is located in
 isc::dhcp::Dhcpv4Srv class. It uses \ref libdhcp extensively,
 especially isc::dhcp::Pkt4, isc::dhcp::Option and
 isc::dhcp::IfaceMgr classes. Currently this code offers skeleton
@@ -99,19 +99,19 @@ client. In this case the server will return one of the DHCPv4 Client FQDN or
 Host Name %Option in its response with the name which was selected for the
 client to indicate that this name will be used to perform DNS update.
 
-The b10-dhcp-ddns process is responsible for the actual communication with the
-DNS, i.e. to send DNS update messages. The b10-dhcp4 module is responsible for
+The kea-dhcp-ddns process is responsible for the actual communication with the
+DNS, i.e. to send DNS update messages. The kea-dhcp4 module is responsible for
 generating @ref isc::dhcp_ddns::NameChangeRequest and sending it to
-the b10-dhcp-ddns module. The @ref isc::dhcp_ddns::NameChangeRequest object
+the kea-dhcp-ddns module. The @ref isc::dhcp_ddns::NameChangeRequest object
 represents changes to the DNS bindings, related to acquisition, renewal or
-release of the DHCP lease. The b10-dhcp4 module implements the simple FIFO queue
+release of the DHCP lease. The kea-dhcp4 module implements the simple FIFO queue
 of the NameChangeRequest objects. The module logic, which processes the incoming
 DHCPv4 Client FQDN and Host Name Options puts these requests into the FIFO queue.
 
 @todo Currently the FIFO queue is not processed after the NameChangeRequests are
 generated and added to it. In the future implementation steps it is planned to
 create a code which will check if there are any outstanding requests in the queue
-and send them to the b10-dhcp-ddns module when server is idle waiting for DHCP
+and send them to the kea-dhcp-ddns module when server is idle waiting for DHCP
 messages.
 
 When client gets an address from the server, a DHCPv4 server may generate 0, 1
@@ -121,10 +121,10 @@ update for any other reason.
 
 Server may generate 1 NameChangeRequest in a case when client acquired a new
 lease or it releases an existing lease. In the former case, the NameChangeRequest
-type is CHG_ADD, which indicates that the b10-dhcp-ddns module should add a new
+type is CHG_ADD, which indicates that the kea-dhcp-ddns module should add a new
 DNS binding for the client, and it is assumed that there is no DNS binding for
 this client already. In the latter case, the NameChangeRequest type is CHG_REMOVE
-to indicate to the b10-dhcp-ddns module that an existing DNS binding should be
+to indicate to the kea-dhcp-ddns module that an existing DNS binding should be
 removed from the DNS. The binding consists of the forward and reverse mapping.
 The server may only remove the mapping which it had added. Therefore, the lease
 database holds the information which updates (no update, reverse only update,

src/bin/dhcp4/dhcp4.spec

@@ -346,28 +346,28 @@
                 "item_type": "string",
                 "item_optional": true,
                 "item_default": "127.0.0.1",
-                "item_description" : "IP address of b10-dhcp-ddns (IPv4 or IPv6)"
+                "item_description" : "IP address of kea-dhcp-ddns (IPv4 or IPv6)"
             },
             {
                 "item_name": "server-port",
                 "item_type": "integer",
                 "item_optional": true,
                 "item_default": 53001,
-                "item_description" : "port number of b10-dhcp-ddns"
+                "item_description" : "port number of kea-dhcp-ddns"
             },
             {
                 "item_name": "sender-ip",
                 "item_type": "string",
                 "item_optional": true,
                 "item_default": "",
-                "item_description" : "IP address from which to send to b10-dhcp-ddns (IPv4 or IPv6)"
+                "item_description" : "IP address from which to send to kea-dhcp-ddns (IPv4 or IPv6)"
             },
             {
                 "item_name": "sender-port",
                 "item_type": "integer",
                 "item_optional": true,
                 "item_default": 0,
-                "item_description" : "port number from which to send to b10-dhcp-ddns"
+                "item_description" : "port number from which to send to kea-dhcp-ddns"
             },
             {
                 "item_name": "max-queue-size",
@@ -381,7 +381,7 @@
                 "item_type": "string",
                 "item_optional": true,
                 "item_default": "UDP",
-                "item_description" : "Socket protocol to use with b10-dhcp-ddns"
+                "item_description" : "Socket protocol to use with kea-dhcp-ddns"
             },
             {
                 "item_name": "ncr-format",

src/bin/dhcp4/dhcp4_log.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 2014 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
@@ -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-dhcp4.
+/// Defines the logger used by the top-level component of kea-dhcp4.
 
 #include <dhcp4/dhcp4_log.h>
 

src/bin/dhcp4/dhcp4_log.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 2014 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
@@ -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.
@@ -50,7 +50,7 @@ const int DBG_DHCP4_DETAIL = DBGLVL_TRACE_DETAIL;
 // This level is used to log the contents of packets received and sent.
 const int DBG_DHCP4_DETAIL_DATA = DBGLVL_TRACE_DETAIL_DATA;
 
-/// Define the logger for the "dhcp4" module part of b10-dhcp4.  We could define
+/// Define the logger for the "dhcp4" module part of kea-dhcp4.  We could define
 /// a logger in each file, but we would want to define a common name to avoid
 /// spelling mistakes, so it is just one small step from there to define a
 /// module-common logger.

src/bin/dhcp4/dhcp4_messages.mes

@@ -77,7 +77,7 @@ change is committed by the administrator.
 A debug message indicating that the DHCPv4 server has received an
 updated configuration from the BIND 10 configuration system.
 
-% DHCP4_DDNS_REQUEST_SEND_FAILED failed sending a request to b10-dhcp-ddns, error: %1,  ncr: %2
+% DHCP4_DDNS_REQUEST_SEND_FAILED failed sending a request to kea-dhcp-ddns, error: %1,  ncr: %2
 This error message indicates that DHCP4 server attempted to send a DDNS
 update reqeust to the DHCP-DDNS server.  This is most likely a configuration or
 networking error.
@@ -177,7 +177,7 @@ failure.
 
 % DHCP4_NCR_CREATION_FAILED failed to generate name change requests for DNS: %1
 This message indicates that server was unable to generate NameChangeRequests
-which should be sent to the b10-dhcp_ddns module to create
+which should be sent to the kea-dhcp_ddns module to create
 new DNS records for the lease being acquired or to update existing records
 for the renewed lease. The reason for the failure is printed in the logged
 message.

src/bin/dhcp4/dhcp4_srv.cc

@@ -1908,7 +1908,7 @@ Dhcpv4Srv::d2ClientErrorHandler(const
                                 dhcp_ddns::NameChangeRequestPtr& ncr) {
     LOG_ERROR(dhcp4_logger, DHCP4_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/dhcp4/dhcp4_srv.h

@@ -174,7 +174,7 @@ public:
 
     /// @brief Implements the error handler for DHCP_DDNS IO errors
     ///
-    /// Invoked when a NameChangeRequest send to b10-dhcp-ddns completes with
+    /// Invoked when a NameChangeRequest send to kea-dhcp-ddns completes with
     /// a failed status.  These are communications errors, not data related
     /// failures.
     ///
@@ -490,7 +490,7 @@ protected:
     /// This creates the @c isc::dhcp_ddns::NameChangeRequest; emits a
     /// the debug message which indicates whether the request being added is
     /// to remove DNS entry or add a new entry; and then sends the request
-    /// to the D2ClientMgr for transmission to b10-dhcp-ddns.
+    /// to the D2ClientMgr for transmission to kea-dhcp-ddns.
     ///
     /// @param chg_type A type of the NameChangeRequest (ADD or REMOVE).
     /// @param lease A lease for which the NameChangeRequest is created and

src/bin/dhcp4/b10-dhcp4.xml

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2011, 2014  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
@@ -20,39 +20,41 @@
 <refentry>
 
   <refentryinfo>
-    <date>October 27, 2011</date>
+    <date>July 1, 2014</date>
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>b10-dhcp4</refentrytitle>
+    <refentrytitle>kea-dhcp4</refentrytitle>
     <manvolnum>8</manvolnum>
-    <refmiscinfo>BIND10</refmiscinfo>
+    <refmiscinfo>Kea</refmiscinfo>
   </refmeta>
 
   <refnamediv>
-    <refname>b10-dhcp4</refname>
-    <refpurpose>DHCPv4 server in BIND 10 architecture</refpurpose>
+    <refname>kea-dhcp4</refname>
+    <refpurpose>DHCPv4 server in Kea</refpurpose>
   </refnamediv>
 
   <docinfo>
     <copyright>
-      <year>2011</year>
+      <year>2014</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>b10-dhcp4</command>
+      <command>kea-dhcp4</command>
       <arg><option>-v</option></arg>
+      <arg><option>-c<replaceable class="parameter">config-file</replaceable></option></arg>
+      <arg><option>-p<replaceable class="parameter">port-number</replaceable></option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      The <command>b10-dhcp4</command> daemon will provide the
-       DHCPv4 server implementation when it becomes functional.
+      The <command>kea-dhcp4</command> daemon provides the
+       DHCPv4 server implementation.
     </para>
 
   </refsect1>
@@ -68,23 +70,26 @@
         <term><option>-v</option></term>
         <listitem><para>
           Enable verbose mode.
-<!-- TODO: what does this do? -->
         </para></listitem>
       </varlistentry>
 
-    </variablelist>
-  </refsect1>
+      <varlistentry>
+        <term><option>-c</option></term>
+        <listitem><para>
+          Configuration file including the configuration for DHCPv4 server.
+          It may also contain configuration entries for other Kea services.
+        </para></listitem>
+      </varlistentry>
 
-  <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-      <citerefentry>
-        <refentrytitle>b10-init</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-        <refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>.
-    </para>
+      <varlistentry>
+        <term><option>-p</option></term>
+        <listitem><para>
+          Port number (1-65535) on which the server listens. This is useful
+          for testing purposes only.
+        </para></listitem>
+      </varlistentry>
+
+    </variablelist>
   </refsect1>
 
   <refsect1>
@@ -93,6 +98,11 @@
       The <command>b10-dhcp4</command> daemon was first coded in
       November 2011 by Tomek Mrugalski.
     </para>
+    <para>
+      Kea became a standalone server and the BIND10 framework was
+      removed. The DHCPv4 server binary was renamed to kea-dhcp4
+      in July 2014.
+    </para>
   </refsect1>
 </refentry><!--
  - Local variables:

src/bin/dhcp4/main.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2012  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2012, 2014 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
@@ -37,7 +37,7 @@ using namespace std;
 
 namespace {
 
-const char* const DHCP4_NAME = "b10-dhcp4";
+const char* const DHCP4_NAME = "kea-dhcp4";
 
 const char* const DHCP4_LOGGER_NAME = "kea";
 

src/bin/dhcp4/tests/dhcp4_process_tests.sh.in

@@ -59,7 +59,7 @@ CONFIG_INVALID="{
 }"
 
 # Set the location of the executable.
-bin="b10-dhcp4"
+bin="kea-dhcp4"
 bin_path=@abs_top_builddir@/src/bin/dhcp4
 
 # Import common test library.

src/bin/dhcp6/.gitignore

@@ -1,5 +1,5 @@
-/b10-dhcp6
-/b10-dhcp6.8
+/kea-dhcp6
+/kea-dhcp6.8
 /dhcp6_messages.cc
 /dhcp6_messages.h
 /spec_config.h

src/bin/dhcp6/Makefile.am

@@ -15,20 +15,18 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-
 CLEANFILES = spec_config.h dhcp6_messages.h dhcp6_messages.cc s-messages
 
-man_MANS = b10-dhcp6.8
+man_MANS = kea-dhcp6.8
 DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) b10-dhcp6.xml dhcp6.spec
+EXTRA_DIST = $(man_MANS) kea-dhcp6.xml dhcp6.spec
 
 if GENERATE_DOCS
 
-b10-dhcp6.8: b10-dhcp6.xml
+kea-dhcp6.8: kea-dhcp6.xml
 	@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-        $(srcdir)/b10-dhcp6.xml
+        $(srcdir)/kea-dhcp6.xml
 
 else
 
@@ -49,35 +47,35 @@ s-messages: dhcp6_messages.mes
 
 BUILT_SOURCES = spec_config.h dhcp6_messages.h dhcp6_messages.cc
 
-pkglibexec_PROGRAMS = b10-dhcp6
+sbin_PROGRAMS = kea-dhcp6
 
-b10_dhcp6_SOURCES  = main.cc
-b10_dhcp6_SOURCES += dhcp6_log.cc dhcp6_log.h
-b10_dhcp6_SOURCES += dhcp6_srv.cc dhcp6_srv.h
-b10_dhcp6_SOURCES += ctrl_dhcp6_srv.cc ctrl_dhcp6_srv.h
-b10_dhcp6_SOURCES += json_config_parser.cc json_config_parser.h
+kea_dhcp6_SOURCES  = main.cc
+kea_dhcp6_SOURCES += dhcp6_log.cc dhcp6_log.h
+kea_dhcp6_SOURCES += dhcp6_srv.cc dhcp6_srv.h
+kea_dhcp6_SOURCES += ctrl_dhcp6_srv.cc ctrl_dhcp6_srv.h
+kea_dhcp6_SOURCES += json_config_parser.cc json_config_parser.h
 
 if CONFIG_BACKEND_BUNDY
-b10_dhcp6_SOURCES += bundy_controller.cc
+kea_dhcp6_SOURCES += bundy_controller.cc
 endif
 
 if CONFIG_BACKEND_JSON
-b10_dhcp6_SOURCES += kea_controller.cc
+kea_dhcp6_SOURCES += kea_controller.cc
 endif
 
-nodist_b10_dhcp6_SOURCES = dhcp6_messages.h dhcp6_messages.cc
+nodist_kea_dhcp6_SOURCES = dhcp6_messages.h dhcp6_messages.cc
 EXTRA_DIST += dhcp6_messages.mes
 
-b10_dhcp6_LDADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-
-b10_dhcp6dir = $(pkgdatadir)
-b10_dhcp6_DATA = dhcp6.spec
+kea_dhcp6_LDADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+
+kea_dhcp6dir = $(pkgdatadir)
+kea_dhcp6_DATA = dhcp6.spec

src/bin/dhcp6/dhcp6.dox

@@ -16,7 +16,7 @@
  @page dhcp6 DHCPv6 Server Component
 
  BIND10 offers DHCPv6 server implementation. It is implemented as
- b10-dhcp6 component. Its primary code is located in
+ kea-dhcp6 component. Its primary code is located in
  isc::dhcp::Dhcpv6Srv class. It uses \ref libdhcp extensively,
  especially lib::dhcp::Pkt6, isc::dhcp::Option and
  isc::dhcp::IfaceMgr classes. Currently this code offers skeleton
@@ -38,7 +38,7 @@
 
  @section dhcpv6ConfigParser Configuration Parser in DHCPv6
 
- b10-dhcp6 component uses BIND10 cfgmgr for commands and configuration. During
+ kea-dhcp6 component uses BIND10 cfgmgr for commands and configuration. During
  initial configuration (See \ref
  isc::dhcp::ControlledDhcpv6Srv::establishSession()), the configuration handler
  callback is installed (see isc::dhcp::ControlledDhcpv6Srv::dhcp6ConfigHandler().
@@ -104,10 +104,10 @@ DNS update to the client and that the server performs the reverse update only. C
 version of the DHCPv6 server does not support delegation of the forward update
 to the client. The implementation of this feature is planned for the future releases.
 
-The b10-dhcp-ddns process is responsible for the actual communication with the DNS
-server, i.e. to send DNS Update messages. The b10-dhcp6 module is responsible
+The kea-dhcp-ddns process is responsible for the actual communication with the DNS
+server, i.e. to send DNS Update messages. The kea-dhcp6 module is responsible
 for generating so called @ref isc::dhcp_ddns::NameChangeRequest and sending it to the
-b10-dhcp-ddns module. The @ref isc::dhcp_ddns::NameChangeRequest object represents changes to the
+kea-dhcp-ddns module. The @ref isc::dhcp_ddns::NameChangeRequest object represents changes to the
 DNS bindings, related to acquisition, renewal or release of the lease. The bind10-dhcp6
 module implements the simple FIFO queue of the NameChangeRequest objects. The module
 logic, which processes the incoming DHCPv6 Client FQDN Options puts these requests
@@ -116,7 +116,7 @@ into the FIFO queue.
 @todo Currently the FIFO queue is not processed after the NameChangeRequests are
 generated and added to it. In the future implementation steps it is planned to create
 a code which will check if there are any outstanding requests in the queue and
-send them to the b10-dhcp-ddns module when server is idle waiting for DHCP messages.
+send them to the kea-dhcp-ddns module when server is idle waiting for DHCP messages.
 
 In the simplest case, when client gets one address from the server, a DHCPv6 server
 may generate 0, 1 or 2 NameChangeRequests during single message processing. 
@@ -125,10 +125,10 @@ Server generates no NameChangeRequests if it is not configured to update DNS
 
 Server may generate 1 NameChangeRequest in a situation when a client acquires a
 new lease or it releases an existing lease. In the former case, the NameChangeRequest
-type is CHG_ADD, which indicates that the b10-dhcp-ddns module should add a new DNS
+type is CHG_ADD, which indicates that the kea-dhcp-ddns module should add a new DNS
 binding for the client, and it is assumed that there is no DNS binding for this
 client already. In the latter case, the NameChangeRequest type is CHG_REMOVE to
-indicate to the b10-dhcp-ddns module that the existing DNS binding should be removed
+indicate to the kea-dhcp-ddns module that the existing DNS binding should be removed
 from the DNS. The binding consists of the forward and reverse mapping.
 A server may only remove the mapping which it had added. Therefore, the lease database
 holds an information which updates (no update, reverse only update, forward only update,

src/bin/dhcp6/dhcp6.spec

@@ -383,28 +383,28 @@
                 "item_type": "string",
                 "item_optional": true,
                 "item_default": "127.0.0.1",
-                "item_description" : "IP address of b10-dhcp-ddns (IPv4 or IPv6)"
+                "item_description" : "IP address of kea-dhcp-ddns (IPv4 or IPv6)"
             },
             {
                 "item_name": "server-port",
                 "item_type": "integer",
                 "item_optional": true,
                 "item_default": 53001,
-                "item_description" : "port number of b10-dhcp-ddns"
+                "item_description" : "port number of kea-dhcp-ddns"
             },
             {
                 "item_name": "sender-ip",
                 "item_type": "string",
                 "item_optional": true,
                 "item_default": "",
-                "item_description" : "IP address from which to send to b10-dhcp-ddns (IPv4 or IPv6)"
+                "item_description" : "IP address from which to send to kea-dhcp-ddns (IPv4 or IPv6)"
             },
             {
                 "item_name": "sender-port",
                 "item_type": "integer",
                 "item_optional": true,
                 "item_default": 0,
-                "item_description" : "port number from which to send to b10-dhcp-ddns"
+                "item_description" : "port number from which to send to kea-dhcp-ddns"
             },
             {
                 "item_name": "max-queue-size",
@@ -418,7 +418,7 @@
                 "item_type": "string",
                 "item_optional": true,
                 "item_default": "UDP",
-                "item_description" : "Socket protocol to use with b10-dhcp-ddns"
+                "item_description" : "Socket protocol to use with kea-dhcp-ddns"
             },
             {
                 "item_name": "ncr-format",

src/bin/dhcp6/dhcp6_log.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 2014 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
@@ -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_log.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 2014 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
@@ -25,7 +25,7 @@ namespace dhcp {
 /// \brief DHCP6 Logging
 ///
 /// Defines the levels used to output debug messages in the non-library part of
-/// the b10-dhcp6 program.  Higher numbers equate to more verbose (and detailed)
+/// the kea-dhcp6 program.  Higher numbers equate to more verbose (and detailed)
 /// output.
 
 // Debug levels used to log information during startup and shutdown.
@@ -50,7 +50,7 @@ const int DBG_DHCP6_DETAIL = DBGLVL_TRACE_DETAIL;
 // This level is used to log the contents of packets received and sent.
 const int DBG_DHCP6_DETAIL_DATA = DBGLVL_TRACE_DETAIL_DATA;
 
-/// Define the logger for the "dhcp6" module part of b10-dhcp6.  We could define
+/// Define the logger for the "dhcp6" module part of kea-dhcp6.  We could define
 /// a logger in each file, but we would want to define a common name to avoid
 /// spelling mistakes, so it is just one small step from there to define a
 /// module-common logger.

src/bin/dhcp6/dhcp6_messages.mes

@@ -105,7 +105,7 @@ that the DNS Update has been performed for it, but the FQDN held in the lease
 database has invalid format and can't be transformed to the canonical on-wire
 format.
 
-% DHCP6_DDNS_REQUEST_SEND_FAILED failed sending a request to b10-dhcp-ddns, error: %1,  ncr: %2
+% DHCP6_DDNS_REQUEST_SEND_FAILED failed sending a request to kea-dhcp-ddns, error: %1,  ncr: %2
 This error message indicates that IPv6 DHCP server failed to send a DDNS
 update reqeust to the DHCP-DDNS server. This is most likely a configuration or
 networking error.

src/bin/dhcp6/dhcp6_srv.cc

@@ -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)
@@ -2615,7 +2615,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/dhcp6_srv.h

@@ -130,7 +130,7 @@ public:
 
     /// @brief Implements the error handler for DHCP_DDNS IO errors
     ///
-    /// Invoked when a NameChangeRequest send to b10-dhcp-ddns completes with
+    /// Invoked when a NameChangeRequest send to kea-dhcp-ddns completes with
     /// a failed status.  These are communications errors, not data related
     /// failures.
     ///
@@ -673,7 +673,7 @@ protected:
     volatile bool shutdown_;
 
     /// Holds a list of @c isc::dhcp_ddns::NameChangeRequest objects, which
-    /// are waiting for sending to b10-dhcp-ddns module.
+    /// are waiting for sending to kea-dhcp-ddns module.
     std::queue<isc::dhcp_ddns::NameChangeRequest> name_change_reqs_;
 };
 

src/bin/dhcp6/b10-dhcp6.xml

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2011, 2014 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
@@ -20,39 +20,41 @@
 <refentry>
 
   <refentryinfo>
-    <date>October 27, 2011</date>
+    <date>July 1, 2014</date>
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>b10-dhcp6</refentrytitle>
+    <refentrytitle>kea-dhcp6</refentrytitle>
     <manvolnum>8</manvolnum>
-    <refmiscinfo>BIND10</refmiscinfo>
+    <refmiscinfo>Kea</refmiscinfo>
   </refmeta>
 
   <refnamediv>
-    <refname>b10-dhcp6</refname>
-    <refpurpose>DHCPv6 server in BIND 10 architecture</refpurpose>
+    <refname>kea-dhcp6</refname>
+    <refpurpose>DHCPv6 server in Kea</refpurpose>
   </refnamediv>
 
   <docinfo>
     <copyright>
-      <year>2011</year>
+      <year>2014</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>b10-dhcp6</command>
+      <command>kea-dhcp6</command>
       <arg><option>-v</option></arg>
+      <arg><option>-c<replaceable class="parameter">config-file</replaceable></option></arg>
+      <arg><option>-p<replaceable class="parameter">port-number</replaceable></option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      The <command>b10-dhcp6</command> daemon will provide the
-       DHCPv6 server implementation when it becomes functional.
+      The <command>kea-dhcp6</command> daemon provides the
+       DHCPv6 server implementation.
     </para>
 
   </refsect1>
@@ -72,19 +74,23 @@
         </para></listitem>
       </varlistentry>
 
-    </variablelist>
-  </refsect1>
+      <varlistentry>
+        <term><option>-c</option></term>
+        <listitem><para>
+          Configuration file including the configuration for DHCPv6 server.
+          It may also contain configuration entries for other Kea services.
+        </para></listitem>
+      </varlistentry>
 
-  <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-      <citerefentry>
-        <refentrytitle>b10-init</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-        <refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>.
-    </para>
+      <varlistentry>
+        <term><option>-p</option></term>
+        <listitem><para>
+          Port number (1-65535) on which the server listens. This is useful
+          for testing purposes only.
+        </para></listitem>
+      </varlistentry>
+
+    </variablelist>
   </refsect1>
 
   <refsect1>
@@ -93,6 +99,11 @@
       The <command>b10-dhcp6</command> daemon was first coded in
       June 2011 by Tomek Mrugalski.
     </para>
+    <para>
+      Kea became a standalone server and the BIND10 framework was
+      removed. The DHCPv6 server binary was renamed to kea-dhcp6 in
+      July 2014.
+    </para>
   </refsect1>
 </refentry><!--
  - Local variables:

src/bin/dhcp6/main.cc

@@ -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/bin/dhcp6/tests/dhcp6_process_tests.sh.in

@@ -61,7 +61,7 @@ CONFIG_INVALID="{
 }"
 
 # Set the location of the executable.
-bin="b10-dhcp6"
+bin="kea-dhcp6"
 bin_path=@abs_top_builddir@/src/bin/dhcp6
 
 # Import common test library.

src/bin/keactrl/keactrl.conf.in

@@ -10,9 +10,9 @@ kea_config_file=@sysconfdir@/@PACKAGE@/kea.conf
 
 # Location of Kea binaries.
 exec_prefix=@exec_prefix@
-dhcp4_srv=@libexecdir@/@PACKAGE@/b10-dhcp4
-dhcp6_srv=@libexecdir@/@PACKAGE@/b10-dhcp6
-dhcp_ddns_srv=@libexecdir@/@PACKAGE@/b10-dhcp-ddns
+dhcp4_srv=@sbindir@/kea-dhcp4
+dhcp6_srv=@sbindir@/kea-dhcp6
+dhcp_ddns_srv=@sbindir@/kea-dhcp-ddns
 
 # Start DHCPv4 server?
 dhcp4=yes

src/bin/keactrl/tests/keactrl_tests.sh.in

@@ -27,7 +27,7 @@ KEACTRL_CFG_FILE=@abs_top_builddir@/src/bin/keactrl/tests/keactrl_test.conf
 # Path to the Kea log file.
 LOG_FILE=@abs_top_builddir@/src/bin/keactrl/tests/test.log
 # Binaries' names
-wildcard_name="b10-dhcp"
+wildcard_name="kea-dhcp"
 kea4_name="${wildcard_name}4"
 kea6_name="${wildcard_name}6"
 d2_name="${wildcard_name}-ddns"
@@ -79,9 +79,9 @@ config="{
 }"
 
 # Fixed part of the keactrl configuration file.
-keactrl_fixed_config="dhcp4_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp4/b10-dhcp4\n\
-dhcp6_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp6/b10-dhcp6\n\
-dhcp_ddns_srv=${KEACTRL_BUILD_DIR}/src/bin/d2/b10-dhcp-ddns\n"
+keactrl_fixed_config="dhcp4_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp4/kea-dhcp4\n\
+dhcp6_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp6/kea-dhcp6\n\
+dhcp_ddns_srv=${KEACTRL_BUILD_DIR}/src/bin/d2/kea-dhcp-ddns\n"
 
 # This test checks that DHCPv4, DHCPv6 and D2 server can be started and
 # shut down.

src/bin/sockcreator/.gitignore

@@ -1,2 +1,2 @@
-/b10-sockcreator
-/b10-sockcreator.8
+/kea-sockcreator
+/kea-sockcreator.8

src/bin/sockcreator/Makefile.am

@@ -12,25 +12,25 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 CLEANFILES = *.gcno *.gcda
 
-man_MANS = b10-sockcreator.8
+man_MANS = kea-sockcreator.8
 DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) b10-sockcreator.xml
+EXTRA_DIST = $(man_MANS) kea-sockcreator.xml
 
 if GENERATE_DOCS
 
-b10-sockcreator.8: b10-sockcreator.xml
-	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-sockcreator.xml
+kea-sockcreator.8: kea-sockcreator.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-sockcreator.xml
 
 else
 
 $(man_MANS):
 	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@
+	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
 
 endif
 
-pkglibexec_PROGRAMS = b10-sockcreator
+pkglibexec_PROGRAMS = kea-sockcreator
 
-b10_sockcreator_SOURCES = sockcreator.cc sockcreator.h main.cc
-b10_sockcreator_LDADD  = $(top_builddir)/src/lib/util/io/libkea-util-io.la
-b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+kea_sockcreator_SOURCES = sockcreator.cc sockcreator.h main.cc
+kea_sockcreator_LDADD  = $(top_builddir)/src/lib/util/io/libkea-util-io.la
+kea_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

src/bin/sockcreator/b10-sockcreator.xml

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2012, 2014 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
@@ -20,48 +20,44 @@
 <refentry>
 
   <refentryinfo>
-    <date>February 28, 2012</date>
+    <date>July 1, 2014</date>
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>b10-sockcreator</refentrytitle>
+    <refentrytitle>kea-sockcreator</refentrytitle>
     <manvolnum>8</manvolnum>
-    <refmiscinfo>BIND10</refmiscinfo>
+    <refmiscinfo>Kea</refmiscinfo>
   </refmeta>
 
   <refnamediv>
-    <refname>b10-sockcreator</refname>
+    <refname>kea-sockcreator</refname>
     <refpurpose>socket creation daemon</refpurpose>
   </refnamediv>
 
   <docinfo>
     <copyright>
-      <year>2012</year>
+      <year>2014</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>b10-sockcreator</command>
+      <command>kea-sockcreator</command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      The <command>b10-sockcreator</command> daemon's entire job
+      The <command>kea-sockcreator</command> daemon's entire job
       is to create sockets and assign names to them.
-      It is started by
-      <citerefentry><refentrytitle>b10-init</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      and communicates with it.
-      The new socket is sent over a file descriptor.
     </para>
 
 <!-- TODO: integrate README here -->
 
     <para>
-      The <command>b10-sockcreator</command> daemon will exit
+      The <command>kea-sockcreator</command> daemon will exit
       if there is an unrecoverable error or unknown command.
     </para>
 
@@ -70,23 +66,22 @@
   <refsect1>
     <title>SEE ALSO</title>
     <para>
-      <citerefentry>
-        <refentrytitle>b10-init</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-        <refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>,
-      <citetitle>BIND 10 Guide</citetitle>.
+      <citetitle>Kea Guide</citetitle>.
     </para>
 <!-- TODO: point to developer docs -->
   </refsect1>
 
   <refsect1>
-    <title>AUTHORS</title>
+    <title>HISTORY</title>
     <para>
       The <command>b10-sockcreator</command> daemon
       was initially designed by Michal Vaner of CZNIC.
     </para>
+    <para>
+      Kea became a standalone server and the BIND10 framework was
+      removed. The socket creator server binary was renamed to
+      kea-sockcreator in July 2014.
+    </para>
   </refsect1>
 
 </refentry><!--

src/hooks/dhcp/user_chk/libdhcp_user_chk.dox

@@ -1,4 +1,4 @@
-// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2014  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
@@ -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:
@@ -125,7 +125,7 @@ the library will unload.
 
 ### Configuring the DHCP Modules
 it must be configured as a hook library for the
-desired DHCP server modules.  Note that the user_chk library is installed alongside the BIND10 libraries in "<install-dir>/lib" where <install-dir> is determined by the --prefix option of the configure script.  It defaults to "/usr/local". Assuming the default value then, configuring b10-dhcp4 to load the user_chk
+desired DHCP server modules.  Note that the user_chk library is installed alongside the BIND10 libraries in "<install-dir>/lib" where <install-dir> is determined by the --prefix option of the configure script.  It defaults to "/usr/local". Assuming the default value then, configuring kea-dhcp4 to load the user_chk
 library could be done with the following BIND10 configuration commands:
 
 @code
@@ -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
 config add Dhcp6/hook_libraries

src/lib/dhcp_ddns/dhcp_ddns_log.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013, 2014 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
@@ -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-dhcp_ddns.
+/// Defines the logger used by the top-level component of kea-dhcp_ddns.
 
 #include <dhcp_ddns/dhcp_ddns_log.h>
 

src/lib/dhcpsrv/d2_client_cfg.h

@@ -17,7 +17,7 @@
 
 /// @file d2_client_cfg.h Defines the D2ClientConfig class.
 /// This file defines the classes Kea uses to manage configuration needed to
-/// act as a client of the b10-dhcp-ddns module (aka D2).
+/// act as a client of the kea-dhcp-ddns module (aka D2).
 ///
 #include <asiolink/io_address.h>
 #include <dhcp_ddns/ncr_io.h>
@@ -78,14 +78,14 @@ public:
     /// @brief Constructor
     ///
     /// @param enable_updates Enables DHCP-DDNS updates
-    /// @param server_ip IP address of the b10-dhcp-ddns server (IPv4 or IPv6)
-    /// @param server_port IP port of the b10-dhcp-ddns server
-    /// @param sender_ip IP address of the b10-dhcp-ddns server (IPv4 or IPv6)
-    /// @param sender_port IP port of the b10-dhcp-ddns server
+    /// @param server_ip IP address of the kea-dhcp-ddns server (IPv4 or IPv6)
+    /// @param server_port IP port of the kea-dhcp-ddns server
+    /// @param sender_ip IP address of the kea-dhcp-ddns server (IPv4 or IPv6)
+    /// @param sender_port IP port of the kea-dhcp-ddns server
     /// @param max_queue_size  maximum NCRs allowed in sender's queue
-    /// @param ncr_protocol Socket protocol to use with b10-dhcp-ddns
+    /// @param ncr_protocol Socket protocol to use with kea-dhcp-ddns
     /// Currently only UDP is supported.
-    /// @param ncr_format Format of the b10-dhcp-ddns requests.
+    /// @param ncr_format Format of the kea-dhcp-ddns requests.
     /// Currently only JSON format is supported.
     /// @param always_include_fqdn Enables always including the FQDN option in
     /// DHCP responses.
@@ -126,12 +126,12 @@ public:
         return(enable_updates_);
     }
 
-    /// @brief Return the IP address of b10-dhcp-ddns (IPv4 or IPv6).
+    /// @brief Return the IP address of kea-dhcp-ddns (IPv4 or IPv6).
     const isc::asiolink::IOAddress& getServerIp() const {
         return(server_ip_);
     }
 
-    /// @brief Return the IP port of b10-dhcp-ddns.
+    /// @brief Return the IP port of kea-dhcp-ddns.
     size_t getServerPort() const {
         return(server_port_);
     }
@@ -151,12 +151,12 @@ public:
         return(max_queue_size_);
     }
 
-    /// @brief Return the socket protocol to use with b10-dhcp-ddns.
+    /// @brief Return the socket protocol to use with kea-dhcp-ddns.
     const dhcp_ddns::NameChangeProtocol& getNcrProtocol() const {
          return(ncr_protocol_);
     }
 
-    /// @brief Return the b10-dhcp-ddns request format.
+    /// @brief Return the kea-dhcp-ddns request format.
     const dhcp_ddns::NameChangeFormat& getNcrFormat() const {
         return(ncr_format_);
     }
@@ -221,10 +221,10 @@ private:
     /// @brief Indicates whether or not DHCP DDNS updating is enabled.
     bool enable_updates_;
 
-    /// @brief IP address of the b10-dhcp-ddns server (IPv4 or IPv6).
+    /// @brief IP address of the kea-dhcp-ddns server (IPv4 or IPv6).
     isc::asiolink::IOAddress server_ip_;
 
-    /// @brief IP port of the b10-dhcp-ddns server.
+    /// @brief IP port of the kea-dhcp-ddns server.
     size_t server_port_;
 
     /// @brief IP address on which the client should send
@@ -236,11 +236,11 @@ private:
     /// @brief Maxium number of NCRs allowed to queue waiting to send
     size_t max_queue_size_;
 
-    /// @brief The socket protocol to use with b10-dhcp-ddns.
+    /// @brief The socket protocol to use with kea-dhcp-ddns.
     /// Currently only UDP is supported.
     dhcp_ddns::NameChangeProtocol ncr_protocol_;
 
-    /// @brief Format of the b10-dhcp-ddns requests.
+    /// @brief Format of the kea-dhcp-ddns requests.
     /// Currently only JSON format is supported.
     dhcp_ddns::NameChangeFormat ncr_format_;
 

src/lib/dhcpsrv/d2_client_mgr.h

@@ -17,7 +17,7 @@
 
 /// @file d2_client_mgr.h Defines the D2ClientMgr class.
 /// This file defines the class Kea uses to act as a client of the
-/// b10-dhcp-ddns module (aka D2).
+/// kea-dhcp-ddns module (aka D2).
 ///
 #include <asiolink/io_address.h>
 #include <dhcp_ddns/ncr_io.h>
@@ -35,7 +35,7 @@ namespace isc {
 namespace dhcp {
 
 /// @brief Defines the type for D2 IO error handler.
-/// This callback is invoked when a send to b10-dhcp-ddns completes with a
+/// This callback is invoked when a send to kea-dhcp-ddns completes with a
 /// failed status.  This provides the application layer (Kea) with a means to
 /// handle the error appropriately.
 ///
@@ -51,9 +51,9 @@ boost::function<void(const dhcp_ddns::NameChangeSender::Result result,
 /// @brief D2ClientMgr isolates Kea from the details of being a D2 client.
 ///
 /// Provides services for managing the current dhcp-ddns configuration and
-/// as well as communications with b10-dhcp-ddns.  Regarding configuration it
+/// as well as communications with kea-dhcp-ddns.  Regarding configuration it
 /// provides services to store, update, and access the current dhcp-ddns
-/// configuration.  As for b10-dhcp-ddns communications, D2ClientMgr creates
+/// configuration.  As for kea-dhcp-ddns communications, D2ClientMgr creates
 /// maintains a NameChangeSender appropriate to the current configuration and
 /// provides services to start, stop, and post NCRs to the sender.  Additionally
 /// there are methods to examine the queue of requests currently waiting for
@@ -247,7 +247,7 @@ public:
     template <class T>
     void adjustDomainName(const T& fqdn, T& fqdn_resp);
 
-    /// @brief Enables sending NameChangeRequests to b10-dhcp-ddns
+    /// @brief Enables sending NameChangeRequests to kea-dhcp-ddns
     ///
     /// Places the NameChangeSender into send mode. This instructs the
     /// sender to begin dequeuing and transmitting requests and to accept
@@ -270,7 +270,7 @@ public:
     void startSender(D2ClientErrorHandler error_handler,
                      isc::asiolink::IOService& io_service);
 
-    /// @brief Enables sending NameChangeRequests to b10-dhcp-ddns
+    /// @brief Enables sending NameChangeRequests to kea-dhcp-ddns
     ///
     /// Places the NameChangeSender into send mode. This instructs the
     /// sender to begin dequeuing and transmitting requests and to accept
@@ -293,7 +293,7 @@ public:
     /// messages for transmission, false otherwise.
     bool amSending() const;
 
-    /// @brief Disables sending NameChangeRequests to b10-dhcp-ddns
+    /// @brief Disables sending NameChangeRequests to kea-dhcp-ddns
     ///
     /// Takes the NameChangeSender out of send mode.  The sender will stop
     /// transmitting requests, though any queued requests remain queued.
@@ -303,10 +303,10 @@ public:
     /// may throw NCRSenderExceptions exceptions.
     void stopSender();
 
-    /// @brief Send the given NameChangeRequests to b10-dhcp-ddns
+    /// @brief Send the given NameChangeRequests to kea-dhcp-ddns
     ///
     /// Passes NameChangeRequests to the NCR sender for transmission to
-    /// b10-dhcp-ddns. If the sender rejects the message, the client's error
+    /// kea-dhcp-ddns. If the sender rejects the message, the client's error
     /// handler will be invoked.  The most likely cause for rejection is
     /// the senders' queue has reached maximum capacity.
     ///

src/lib/dhcpsrv/dhcpsrv_messages.mes

@@ -150,39 +150,39 @@ the new parameters.
 
 % DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION error handler for DHCP_DDNS IO generated an expected exception: %1
 This is an error message that occurs when an attempt to send a request to
-b10-dhcp-ddns fails there registered error handler threw an uncaught exception.
+kea-dhcp-ddns fails there registered error handler threw an uncaught exception.
 This is a programmatic error which should not occur. By convention, the error
 handler should not propagate exceptions. Please report this error.
 
 % DHCPSRV_DHCP_DDNS_HANDLER_NULL error handler for DHCP_DDNS IO is not set.
 This is an error message that occurs when an attempt to send a request to
-b10-dhcp-ddns fails and there is no registered error handler.  This is a
+kea-dhcp-ddns fails and there is no registered error handler.  This is a
 programmatic error which should never occur and should be reported.
 
 % DHCPSRV_DHCP_DDNS_NCR_REJECTED NameChangeRequest rejected by the sender: %1, ncr: %2
 This is an error message indicating that NameChangeSender used to deliver DDNS
-update requests to b10-dhcp-ddns rejected the request.  This most likely cause
+update requests to kea-dhcp-ddns rejected the request.  This most likely cause
 is the sender's queue has reached maximum capacity.  This would imply that
 requests are being generated faster than they can be delivered.
 
-% DHCPSRV_DHCP_DDNS_NCR_SENT NameChangeRequest sent to b10-dhcp-ddns: %1
+% DHCPSRV_DHCP_DDNS_NCR_SENT NameChangeRequest sent to kea-dhcp-ddns: %1
 A debug message issued when a NameChangeRequest has been successfully sent to
-b10-dhcp-ddns.
+kea-dhcp-ddns.
 
 % DHCPSRV_DHCP_DDNS_SENDER_STARTED NameChangeRequest sender has been started: %1
-A informational message issued when a communications with b10-dhcp-ddns has
+A informational message issued when a communications with kea-dhcp-ddns has
 been successfully started.
 
 % DHCPSRV_DHCP_DDNS_SENDER_STOPPED NameChangeRequest sender has been stopped.
-A informational message issued when a communications with b10-dhcp-ddns has
+A informational message issued when a communications with kea-dhcp-ddns has
 been stopped. This normally occurs during reconfiguration and as part of normal
-shutdown. It may occur if b10-dhcp-ddns communications breakdown.
+shutdown. It may occur if kea-dhcp-ddns communications breakdown.
 
 % DHCPSRV_DHCP_DDNS_SUSPEND_UPDATES DHCP_DDNS updates are being suspended.
 This is a warning message indicating the DHCP_DDNS updates have been turned
-off.  This should only occur if IO errors communicating with b10-dhcp-ddns
+off.  This should only occur if IO errors communicating with kea-dhcp-ddns
 have been experienced.  Any such errors should have preceding entries in the
-log with details.  No further attempts to communicate with b10-dhcp-ddns will
+log with details.  No further attempts to communicate with kea-dhcp-ddns will
 be made without intervention.
 
 % DHCPSRV_HOOK_LEASE4_RENEW_SKIP DHCPv4 lease was not renewed because a callout set the skip flag.

src/lib/dhcpsrv/tests/d2_udp_unittest.cc

@@ -72,8 +72,8 @@ public:
 
     /// @brief Updates the D2ClientMgr's configuration to DDNS enabled.
     ///
-    /// @param server_address IP address of b10-dhcp-ddns.
-    /// @param server_port IP port number of b10-dhcp-ddns.
+    /// @param server_address IP address of kea-dhcp-ddns.
+    /// @param server_port IP port number of kea-dhcp-ddns.
     /// @param protocol NCR protocol to use. (Currently only UDP is
     /// supported).
     void enableDdns(const std::string& server_address,

src/lib/testutils/dhcp_test_lib.sh.in

@@ -13,7 +13,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 # A list of Kea processes, mainly used by the cleanup functions.
-KEA_PROCS="b10-dhcp4 b10-dhcp6 b10-dhcp-ddns"
+KEA_PROCS="kea-dhcp4 kea-dhcp6 kea-dhcp-ddns"
 
 ### Logging functions ###
 

tests/tools/perfdhcp/perfdhcp.xml

@@ -853,8 +853,8 @@
     <refsect1>
         <title>SEE ALSO</title>
         <para>
-            <citerefentry><refentrytitle>b10-dhcp4</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>b10-dhcp6</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>kea-dhcp4</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>kea-dhcp6</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
             <citetitle>BIND 10 Guide</citetitle>,
             <citetitle>DHCP Performance Guide</citetitle>.
         </para>