Commit 169b164a authored by Marcin Siodelski's avatar Marcin Siodelski

[3414] References to b10-dhcp* modified to reference kea-dhcp*.

parent 73e2d385
...@@ -26,7 +26,7 @@ namespace d2 { ...@@ -26,7 +26,7 @@ namespace d2 {
const char* D2Controller::d2_app_name_ = "DHCP-DDNS"; const char* D2Controller::d2_app_name_ = "DHCP-DDNS";
/// @brief Defines the executable name. This is passed into the base class /// @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& DControllerBasePtr&
D2Controller::instance() { D2Controller::instance() {
......
...@@ -26,7 +26,7 @@ namespace d2 { ...@@ -26,7 +26,7 @@ namespace d2 {
const char* D2Controller::d2_app_name_ = "DhcpDdns"; const char* D2Controller::d2_app_name_ = "DhcpDdns";
/// @brief Defines the executable name. This is passed into the base class /// @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& DControllerBasePtr&
D2Controller::instance() { D2Controller::instance() {
......
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
"commands": [ "commands": [
{ {
"command_name": "shutdown", "command_name": "shutdown",
"command_description": "Shuts down b10-dhcp-ddns module server.", "command_description": "Shuts down kea-dhcp-ddns module server.",
"command_args": [ "command_args": [
{ {
"item_name": "type", "item_name": "type",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>b10-dhcp-ddns</refname> <refname>kea-dhcp-ddns</refname>
<refpurpose>DHCP-DDNS process in Kea</refpurpose> <refpurpose>DHCP-DDNS process in Kea</refpurpose>
</refnamediv> </refnamediv>
......
...@@ -25,7 +25,7 @@ using namespace isc::d2; ...@@ -25,7 +25,7 @@ using namespace isc::d2;
using namespace std; using namespace std;
/// This file contains entry point (main() function) for standard DHCP-DDNS /// 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 D2Controller singleton instance and invokes its launch method.
/// The exit value of the program will be EXIT_SUCCESS if there were no /// The exit value of the program will be EXIT_SUCCESS if there were no
/// errors, EXIT_FAILURE otherwise. /// errors, EXIT_FAILURE otherwise.
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
@page dhcp4 DHCPv4 Server Component @page dhcp4 DHCPv4 Server Component
BIND10 offers DHCPv4 server implementation. It is implemented as 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, isc::dhcp::Dhcpv4Srv class. It uses \ref libdhcp extensively,
especially isc::dhcp::Pkt4, isc::dhcp::Option and especially isc::dhcp::Pkt4, isc::dhcp::Option and
isc::dhcp::IfaceMgr classes. Currently this code offers skeleton 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 ...@@ -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 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. 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 The kea-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 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 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 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 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. 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 @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 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 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. messages.
When client gets an address from the server, a DHCPv4 server may generate 0, 1 When client gets an address from the server, a DHCPv4 server may generate 0, 1
...@@ -121,10 +121,10 @@ update for any other reason. ...@@ -121,10 +121,10 @@ update for any other reason.
Server may generate 1 NameChangeRequest in a case when client acquired a new 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 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 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 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. 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 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, database holds the information which updates (no update, reverse only update,
......
...@@ -346,28 +346,28 @@ ...@@ -346,28 +346,28 @@
"item_type": "string", "item_type": "string",
"item_optional": true, "item_optional": true,
"item_default": "127.0.0.1", "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_name": "server-port",
"item_type": "integer", "item_type": "integer",
"item_optional": true, "item_optional": true,
"item_default": 53001, "item_default": 53001,
"item_description" : "port number of b10-dhcp-ddns" "item_description" : "port number of kea-dhcp-ddns"
}, },
{ {
"item_name": "sender-ip", "item_name": "sender-ip",
"item_type": "string", "item_type": "string",
"item_optional": true, "item_optional": true,
"item_default": "", "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_name": "sender-port",
"item_type": "integer", "item_type": "integer",
"item_optional": true, "item_optional": true,
"item_default": 0, "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", "item_name": "max-queue-size",
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
"item_type": "string", "item_type": "string",
"item_optional": true, "item_optional": true,
"item_default": "UDP", "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", "item_name": "ncr-format",
......
// 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 // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above // purpose with or without fee is hereby granted, provided that the above
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE. // 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> #include <dhcp4/dhcp4_log.h>
......
// 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 // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above // purpose with or without fee is hereby granted, provided that the above
...@@ -50,7 +50,7 @@ const int DBG_DHCP4_DETAIL = DBGLVL_TRACE_DETAIL; ...@@ -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. // This level is used to log the contents of packets received and sent.
const int DBG_DHCP4_DETAIL_DATA = DBGLVL_TRACE_DETAIL_DATA; 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 /// 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 /// spelling mistakes, so it is just one small step from there to define a
/// module-common logger. /// module-common logger.
......
...@@ -77,7 +77,7 @@ change is committed by the administrator. ...@@ -77,7 +77,7 @@ change is committed by the administrator.
A debug message indicating that the DHCPv4 server has received an A debug message indicating that the DHCPv4 server has received an
updated configuration from the BIND 10 configuration system. 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 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 update reqeust to the DHCP-DDNS server. This is most likely a configuration or
networking error. networking error.
...@@ -177,7 +177,7 @@ failure. ...@@ -177,7 +177,7 @@ failure.
% DHCP4_NCR_CREATION_FAILED failed to generate name change requests for DNS: %1 % DHCP4_NCR_CREATION_FAILED failed to generate name change requests for DNS: %1
This message indicates that server was unable to generate NameChangeRequests 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 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 for the renewed lease. The reason for the failure is printed in the logged
message. message.
......
...@@ -1916,7 +1916,7 @@ Dhcpv4Srv::d2ClientErrorHandler(const ...@@ -1916,7 +1916,7 @@ Dhcpv4Srv::d2ClientErrorHandler(const
dhcp_ddns::NameChangeRequestPtr& ncr) { dhcp_ddns::NameChangeRequestPtr& ncr) {
LOG_ERROR(dhcp4_logger, DHCP4_DDNS_REQUEST_SEND_FAILED). LOG_ERROR(dhcp4_logger, DHCP4_DDNS_REQUEST_SEND_FAILED).
arg(result).arg((ncr ? ncr->toText() : " NULL ")); 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 /// @todo We may wish to revisit this, but for now we will simpy turn
/// them off. /// them off.
CfgMgr::instance().getD2ClientMgr().suspendUpdates(); CfgMgr::instance().getD2ClientMgr().suspendUpdates();
......
...@@ -174,7 +174,7 @@ public: ...@@ -174,7 +174,7 @@ public:
/// @brief Implements the error handler for DHCP_DDNS IO errors /// @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 /// a failed status. These are communications errors, not data related
/// failures. /// failures.
/// ///
...@@ -490,7 +490,7 @@ protected: ...@@ -490,7 +490,7 @@ protected:
/// This creates the @c isc::dhcp_ddns::NameChangeRequest; emits a /// This creates the @c isc::dhcp_ddns::NameChangeRequest; emits a
/// the debug message which indicates whether the request being added is /// 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 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 chg_type A type of the NameChangeRequest (ADD or REMOVE).
/// @param lease A lease for which the NameChangeRequest is created and /// @param lease A lease for which the NameChangeRequest is created and
......
// 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 // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above // purpose with or without fee is hereby granted, provided that the above
...@@ -37,7 +37,7 @@ using namespace std; ...@@ -37,7 +37,7 @@ using namespace std;
namespace { namespace {
const char* const DHCP4_NAME = "b10-dhcp4"; const char* const DHCP4_NAME = "kea-dhcp4";
const char* const DHCP4_LOGGER_NAME = "kea"; const char* const DHCP4_LOGGER_NAME = "kea";
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
@page dhcp6 DHCPv6 Server Component @page dhcp6 DHCPv6 Server Component
BIND10 offers DHCPv6 server implementation. It is implemented as 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, isc::dhcp::Dhcpv6Srv class. It uses \ref libdhcp extensively,
especially lib::dhcp::Pkt6, isc::dhcp::Option and especially lib::dhcp::Pkt6, isc::dhcp::Option and
isc::dhcp::IfaceMgr classes. Currently this code offers skeleton isc::dhcp::IfaceMgr classes. Currently this code offers skeleton
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
@section dhcpv6ConfigParser Configuration Parser in DHCPv6 @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 initial configuration (See \ref
isc::dhcp::ControlledDhcpv6Srv::establishSession()), the configuration handler isc::dhcp::ControlledDhcpv6Srv::establishSession()), the configuration handler
callback is installed (see isc::dhcp::ControlledDhcpv6Srv::dhcp6ConfigHandler(). 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 ...@@ -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 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. 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 The kea-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 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 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 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 module implements the simple FIFO queue of the NameChangeRequest objects. The module
logic, which processes the incoming DHCPv6 Client FQDN Options puts these requests logic, which processes the incoming DHCPv6 Client FQDN Options puts these requests
...@@ -116,7 +116,7 @@ into the FIFO queue. ...@@ -116,7 +116,7 @@ into the FIFO queue.
@todo Currently the FIFO queue is not processed after the NameChangeRequests are @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 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 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 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. 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 ...@@ -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 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 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 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 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. 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 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, holds an information which updates (no update, reverse only update, forward only update,
......
...@@ -383,28 +383,28 @@ ...@@ -383,28 +383,28 @@
"item_type": "string", "item_type": "string",
"item_optional": true, "item_optional": true,
"item_default": "127.0.0.1", "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_name": "server-port",
"item_type": "integer", "item_type": "integer",
"item_optional": true, "item_optional": true,
"item_default": 53001, "item_default": 53001,
"item_description" : "port number of b10-dhcp-ddns" "item_description" : "port number of kea-dhcp-ddns"
}, },
{ {
"item_name": "sender-ip", "item_name": "sender-ip",
"item_type": "string", "item_type": "string",
"item_optional": true, "item_optional": true,
"item_default": "", "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_name": "sender-port",
"item_type": "integer", "item_type": "integer",
"item_optional": true, "item_optional": true,
"item_default": 0, "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", "item_name": "max-queue-size",
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
"item_type": "string", "item_type": "string",
"item_optional": true, "item_optional": true,
"item_default": "UDP", "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", "item_name": "ncr-format",
......
// 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 // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above // purpose with or without fee is hereby granted, provided that the above
......
// 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 // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above // purpose with or without fee is hereby granted, provided that the above
...@@ -25,7 +25,7 @@ namespace dhcp { ...@@ -25,7 +25,7 @@ namespace dhcp {
/// \brief DHCP6 Logging /// \brief DHCP6 Logging
/// ///
/// Defines the levels used to output debug messages in the non-library part of /// 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. /// output.
// Debug levels used to log information during startup and shutdown. // Debug levels used to log information during startup and shutdown.
...@@ -50,7 +50,7 @@ const int DBG_DHCP6_DETAIL = DBGLVL_TRACE_DETAIL; ...@@ -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. // This level is used to log the contents of packets received and sent.
const int DBG_DHCP6_DETAIL_DATA = DBGLVL_TRACE_DETAIL_DATA; 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 /// 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 /// spelling mistakes, so it is just one small step from there to define a
/// module-common logger. /// module-common logger.
......
...@@ -105,7 +105,7 @@ that the DNS Update has been performed for it, but the FQDN held in the lease ...@@ -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 database has invalid format and can't be transformed to the canonical on-wire
format. 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 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 update reqeust to the DHCP-DDNS server. This is most likely a configuration or
networking error. networking error.
......
...@@ -130,7 +130,7 @@ public: ...@@ -130,7 +130,7 @@ public:
/// @brief Implements the error handler for DHCP_DDNS IO errors /// @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 /// a failed status. These are communications errors, not data related
/// failures. /// failures.
/// ///
...@@ -673,7 +673,7 @@ protected: ...@@ -673,7 +673,7 @@ protected:
volatile bool shutdown_; volatile bool shutdown_;
/// Holds a list of @c isc::dhcp_ddns::NameChangeRequest objects, which /// 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_; std::queue<isc::dhcp_ddns::NameChangeRequest> name_change_reqs_;
}; };
......
...@@ -12,7 +12,7 @@ kea_config_file=@sysconfdir@/@PACKAGE@/kea.conf ...@@ -12,7 +12,7 @@ kea_config_file=@sysconfdir@/@PACKAGE@/kea.conf
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
dhcp4_srv=@libexecdir@/@PACKAGE@/kea-dhcp4 dhcp4_srv=@libexecdir@/@PACKAGE@/kea-dhcp4
dhcp6_srv=@libexecdir@/@PACKAGE@/kea-dhcp6 dhcp6_srv=@libexecdir@/@PACKAGE@/kea-dhcp6
dhcp_ddns_srv=@libexecdir@/@PACKAGE@/b10-dhcp-ddns dhcp_ddns_srv=@libexecdir@/@PACKAGE@/kea-dhcp-ddns
# Start DHCPv4 server? # Start DHCPv4 server?
dhcp4=yes dhcp4=yes
......
...@@ -27,7 +27,7 @@ KEACTRL_CFG_FILE=@abs_top_builddir@/src/bin/keactrl/tests/keactrl_test.conf ...@@ -27,7 +27,7 @@ KEACTRL_CFG_FILE=@abs_top_builddir@/src/bin/keactrl/tests/keactrl_test.conf
# Path to the Kea log file. # Path to the Kea log file.
LOG_FILE=@abs_top_builddir@/src/bin/keactrl/tests/test.log LOG_FILE=@abs_top_builddir@/src/bin/keactrl/tests/test.log
# Binaries' names # Binaries' names
wildcard_name="b10-dhcp" wildcard_name="kea-dhcp"
kea4_name="${wildcard_name}4" kea4_name="${wildcard_name}4"
kea6_name="${wildcard_name}6" kea6_name="${wildcard_name}6"
d2_name="${wildcard_name}-ddns" d2_name="${wildcard_name}-ddns"
......
// 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 // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above // purpose with or without fee is hereby granted, provided that the above
...@@ -125,7 +125,7 @@ the library will unload. ...@@ -125,7 +125,7 @@ the library will unload.
### Configuring the DHCP Modules ### Configuring the DHCP Modules
it must be configured as a hook library for the 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: library could be done with the following BIND10 configuration commands:
@code @code
......
// 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 // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above // purpose with or without fee is hereby granted, provided that the above
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE. // 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> #include <dhcp_ddns/dhcp_ddns_log.h>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/// @file d2_client_cfg.h Defines the D2ClientConfig class. /// @file d2_client_cfg.h Defines the D2ClientConfig class.
/// This file defines the classes Kea uses to manage configuration needed to /// 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 <asiolink/io_address.h>
#include <dhcp_ddns/ncr_io.h> #include <dhcp_ddns/ncr_io.h>
...@@ -78,14 +78,14 @@ public: ...@@ -78,14 +78,14 @@ public:
/// @brief Constructor /// @brief Constructor
/// ///
/// @param enable_updates Enables DHCP-DDNS updates /// @param enable_updates Enables DHCP-DDNS updates
/// @param server_ip IP address of the b10-dhcp-ddns server (IPv4 or IPv6) /// @param server_ip IP address of the kea-dhcp-ddns server (IPv4 or IPv6)
/// @param server_port IP port of the b10-dhcp-ddns server /// @param server_port IP port of the kea-dhcp-ddns server
/// @param sender_ip IP address of the b10-dhcp-ddns server (IPv4 or IPv6) /// @param sender_ip IP address of the kea-dhcp-ddns server (IPv4 or IPv6)
/// @param sender_port IP port of the b10-dhcp-ddns server /// @param sender_port IP port of the kea-dhcp-ddns server
/// @param max_queue_size maximum NCRs allowed in sender's queue /// @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. /// 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. /// Currently only JSON format is supported.
/// @param always_include_fqdn Enables always including the FQDN option in /// @param always_include_fqdn Enables always including the FQDN option in
/// DHCP responses. /// DHCP responses.
...@@ -126,12 +126,12 @@ public: ...@@ -126,12 +126,12 @@ public:
return(enable_updates_); 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 { const isc::asiolink::IOAddress& getServerIp() const {
return(server_ip_); 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 { size_t getServerPort() const {
return(server_port_); return(server_port_);
} }
...@@ -151,12 +151,12 @@ public: ...@@ -151,12 +151,12 @@ public:
return(max_queue_size_); return(max_queue_size_);