mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[#313,!199] Several wording changes after review

Browse Source
This commit is contained in:
Tomek Mrugalski
2019-01-21 17:00:50 +01:00
committed by Francis Dupont
parent a4206bb0fb
commit 60531aa972
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/dhcpsrv/hosts_messages.mes
View File

@@ -88,11 +88,11 @@ This debug message is issued when found host identified by the specific
identifier. The arguments specify the identifier and the detailed
description of the host found.
% HOSTS_CFG_GET_ALL_SUBNET_ID4 get all hosts with reservations for subnet id4 %1
% HOSTS_CFG_GET_ALL_SUBNET_ID4 get all hosts with reservations for IPv4 subnet %1
This debug message is issued when starting to retrieve all hosts connected to
the specific DHCPv4 subnet. The argument specifies subnet id.
% HOSTS_CFG_GET_ALL_SUBNET_ID6 get all hosts with reservations for subnet id6 %1
% HOSTS_CFG_GET_ALL_SUBNET_ID6 get all hosts with reservations for IPv6 subnet %1
This debug message is issued when starting to retrieve all hosts connected to
the specific DHCPv6 subnet. The argument specifies subnet id.
@@ -112,21 +112,21 @@ subnet id and address. The arguments specify subnet id, address and
the number of hosts found respectively.
found host details respectively.
% HOSTS_CFG_GET_ALL_SUBNET_ID4_COUNT using subnet id4 %1, found %2 host(s)
% HOSTS_CFG_GET_ALL_SUBNET_ID4_COUNT using IPv4 subnet %1, found %2 host(s)
This debug message include the details of the host found using the DHCPv4
subnet id. The arguments specify subnet id and the number of hosts found
respectively.
% HOSTS_CFG_GET_ALL_SUBNET_ID6_COUNT using subnet id6 %1, found %2 host(s)
% HOSTS_CFG_GET_ALL_SUBNET_ID6_COUNT using IPv6 subnet %1, found %2 host(s)
This debug message include the details of the host found using the DHCPv6
subnet id. The arguments specify subnet id and the number of hosts found
respectively.
% HOSTS_CFG_GET_ALL_SUBNET_ID4_HOST using subnet id4 %1, found host: %2
% HOSTS_CFG_GET_ALL_SUBNET_ID4_HOST using IPv4 subnet %1, found host: %2
This debug message includes the details of the host found using the DHCPv4
subnet id. The arguments specify subnet id and found host details respectively.
% HOSTS_CFG_GET_ALL_SUBNET_ID6_HOST using subnet id6 %1, found host: %2
% HOSTS_CFG_GET_ALL_SUBNET_ID6_HOST using IPv6 subnet %1, found host: %2
This debug message includes the details of the host found using the DHCPv6
subnet id. The arguments specify subnet id and found host details respectively.

8
src/lib/dhcpsrv/mysql_host_data_source.cc
View File

@@ -1951,10 +1951,10 @@ public:
DEL_HOST_ADDR4, // Delete v4 host (subnet-id, addr4)
DEL_HOST_SUBID4_ID, // Delete v4 host (subnet-id, ident.type, identifier)
DEL_HOST_SUBID6_ID, // Delete v6 host (subnet-id, ident.type, identifier)
GET_HOST_SUBID4, // Gets host by IPv4 SubnetID
GET_HOST_SUBID6, // Gets host by IPv6 SubnetID
GET_HOST_SUBID4_PAGE, // Gets host by IPv4 SubnetID beginning by HID
GET_HOST_SUBID6_PAGE, // Gets host by IPv6 SubnetID beginning by HID
GET_HOST_SUBID4, // Get hosts by IPv4 SubnetID
GET_HOST_SUBID6, // Get hosts by IPv6 SubnetID
GET_HOST_SUBID4_PAGE, // Get hosts by IPv4 SubnetID beginning by HID
GET_HOST_SUBID6_PAGE, // Get hosts by IPv6 SubnetID beginning by HID
NUM_STATEMENTS // Number of statements
};

28
src/lib/dhcpsrv/pgsql_host_data_source.cc
View File

@@ -1293,10 +1293,10 @@ public:
DEL_HOST_ADDR4, // Delete v4 host (subnet-id, addr4)
DEL_HOST_SUBID4_ID, // Delete v4 host (subnet-id, ident.type, identifier)
DEL_HOST_SUBID6_ID, // Delete v6 host (subnet-id, ident.type, identifier)
GET_HOST_SUBID4, // Gets host by IPv4 SubnetID
GET_HOST_SUBID6, // Gets host by IPv6 SubnetID
GET_HOST_SUBID4_PAGE, // Gets host by IPv4 SubnetID beginning by HID
GET_HOST_SUBID6_PAGE, // Gets host by IPv6 SubnetID beginning by HID
GET_HOST_SUBID4, // Gets hosts by IPv4 SubnetID
GET_HOST_SUBID6, // Gets hosts by IPv6 SubnetID
GET_HOST_SUBID4_PAGE, // Gets hosts by IPv4 SubnetID beginning by HID
GET_HOST_SUBID6_PAGE, // Gets hosts by IPv6 SubnetID beginning by HID
NUM_STATEMENTS // Number of statements
};
@@ -1721,9 +1721,11 @@ TaggedStatementArray tagged_statements = { {
},
// PgSqlHostDataSourceImpl::GET_HOST_SUBID4
// Retrieves host information along with the DHCPv4 options associated with
// it. Left joining the dhcp4_options table results in multiple rows being
// returned for the same host. The host is retrieved by subnet id.
//
// Retrieves host information for all hosts in a subnet, along with the
// DHCPv4 options associated with it. Left joining the dhcp4_options table
// results in multiple rows being returned for the same host. The hosts are
// retrieved by subnet id.
{1,
{ OID_INT8 }, "get_host_subid4",
"SELECT h.host_id, h.dhcp_identifier, h.dhcp_identifier_type, "
@@ -1740,12 +1742,15 @@ TaggedStatementArray tagged_statements = { {
},
// PgSqlHostDataSourceImpl::GET_HOST_SUBID6
//
// Retrieves host information, IPv6 reservations and DHCPv6 options
// associated with a host using IPv6 subnet id. This query returns
// host information for a single host. However, multiple rows are
// associated with all hosts using the IPv6 subnet id. This query returns
// host information for many hosts. However, multiple rows are
// returned due to left joining IPv6 reservations and DHCPv6 options.
// The number of rows returned is multiplication of number of existing
// IPv6 reservations and DHCPv6 options.
// IPv6 reservations and DHCPv6 options for each host in a subnet. There
// are usually many hosts in a subnet. The amount of returned data may
// be huge.
{1,
{ OID_INT8 }, "get_host_subid6",
"SELECT h.host_id, h.dhcp_identifier, "
@@ -1767,7 +1772,8 @@ TaggedStatementArray tagged_statements = { {
// PgSqlHostDataSourceImpl::GET_HOST_SUBID4_PAGE
// Retrieves host information along with the DHCPv4 options associated with
// it. Left joining the dhcp4_options table results in multiple rows being
// returned for the same host. The host is retrieved by subnet id.
// returned for the same host. The hosts are retrieved by subnet id, starting
// from specified host id. Specified number of hosts is returned.
{3,
{ OID_INT8, OID_INT8, OID_INT8 },
"get_host_subid4_page",