From 94654e08e5da13f8ebd1279b964c20ff56b49e3c Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Fri, 1 Jul 2016 17:03:30 +0200 Subject: [PATCH] [4274] Several minor corrections. --- src/bin/dhcp4/dhcp4.dox | 2 +- src/bin/dhcp4/dhcp4o6.dox | 3 ++- src/bin/dhcp6/dhcp4o6.dox | 3 ++- src/lib/dhcp/dhcp6.h | 2 +- src/lib/dhcpsrv/libdhcpsrv.dox | 3 +++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/bin/dhcp4/dhcp4.dox b/src/bin/dhcp4/dhcp4.dox index b1ec29c76f..1663d5da8c 100644 --- a/src/bin/dhcp4/dhcp4.dox +++ b/src/bin/dhcp4/dhcp4.dox @@ -193,7 +193,7 @@ flags set. @todo Note: the current implementation doesn't allow configuration of the server's behavior with respect to DNS Updates. This is planned for the future. -The default behavioris constituted by the set of constants defined in the +The default behavior is constituted by the set of constants defined in the (upper part of) dhcp4_srv.cc file. Once the configuration is implemented, these constants will be removed. diff --git a/src/bin/dhcp4/dhcp4o6.dox b/src/bin/dhcp4/dhcp4o6.dox index e1de64f22e..10a97c0ecc 100644 --- a/src/bin/dhcp4/dhcp4o6.dox +++ b/src/bin/dhcp4/dhcp4o6.dox @@ -8,7 +8,8 @@ @page dhcpv4o6Dhcp4 DHCPv4-over-DHCPv6 DHCPv4 Server Side Kea supports DHCPv4-over-DHCPv6 using cooperating DHCPv6 and DHCPv4 -servers. This section describes the DHCPv4 server side. +servers. This section describes the DHCPv4 server side. For its +DHCPv6 counter-part, see @ref dhcpv4o6Dhcp6. @section Dhcp4to6Ipc DHCPv6-to-DHCPv4 Inter Process Communication diff --git a/src/bin/dhcp6/dhcp4o6.dox b/src/bin/dhcp6/dhcp4o6.dox index 94af1b9a1c..ed71d71266 100644 --- a/src/bin/dhcp6/dhcp4o6.dox +++ b/src/bin/dhcp6/dhcp4o6.dox @@ -8,7 +8,8 @@ @page dhcpv4o6Dhcp6 DHCPv4-over-DHCPv6 DHCPv6 Server Side Kea supports DHCPv4-over-DHCPv6 using cooperating DHCPv6 and DHCPv4 -servers. This section describes the DHCPv6 server side. +servers. This section describes the DHCPv6 server side. For its +DHCPv6 counter-part, see @ref dhcpv4o6Dhcp4. @section dhcp6to4Ipc DHCPv6-to-DHCPv4 Inter Process Communication diff --git a/src/lib/dhcp/dhcp6.h b/src/lib/dhcp/dhcp6.h index 5969475461..12fc18baaa 100644 --- a/src/lib/dhcp/dhcp6.h +++ b/src/lib/dhcp/dhcp6.h @@ -188,7 +188,7 @@ /* RFC 7341 */ #define DHCPV6_DHCPV4_QUERY 20 #define DHCPV6_DHCPV4_RESPONSE 21 -/* draft-ietf-dhc-dhcpv6-active-leasequery-04 */ +/* RFC 7653 */ //#define DHCPV6_ACTIVELEASEQUERY 22 //#define DHCPV6_STARTTLS 23 diff --git a/src/lib/dhcpsrv/libdhcpsrv.dox b/src/lib/dhcpsrv/libdhcpsrv.dox index 17dc663b45..fcc2f511cc 100644 --- a/src/lib/dhcpsrv/libdhcpsrv.dox +++ b/src/lib/dhcpsrv/libdhcpsrv.dox @@ -382,6 +382,9 @@ enterprise ID carrying interface and remote address suboptions. \ref isc::dhcp::Dhcp4o6IpcBase::send adds them, \ref isc::dhcp::Dhcp4o6IpcBase::receive decodes and removes them. +Also see \ref dhcpv4o6Dhcp4 and \ref dhcpv4o6Dhcp6 for details on how IPC +is used by DHCPv4 and DHCPv6 components. + @todo DHCPv4-over-DHCPv6 which are relayed by a DHCPv6 relay are not yet supported. -- 2.47.2