Commit 1cba2443 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[5376] Addressed review comments.

Updated User's Guide and rename function.
parent 673861c2
......@@ -3852,17 +3852,9 @@ i.e. it will assign increasing integer values starting from 1.</para>
It is possible to override default server identifier values by specifying
"dhcp-server-identifier" option. This option can be specified at any
configuration level, but it is recommended to only specify this option on
global, shared network or subnet level. Specifying this option on a class
or host reservation level will work only in cases when the specified
server identifier is an IP address assigned to one of the interfaces on
which the server is listening to DHCP queries. Otherwise, the server
will drop the messages with these server identifiers. The server will
accept messages including server identifiers specified on the global,
shared network and subnet level, even if they point to IP addresses not
assigned to any interfaces, on which the server is listening to the
DHCP queries.
"dhcp-server-identifier" option. This option is only supported on the
global, shared network and subnet level. It must not be specified
on client class and host reservation level.
......@@ -2863,7 +2863,7 @@ Dhcpv4Srv::acceptServerId(const Pkt4Ptr& query) const {
// This server identifier is not configured for any of the subnets, so
// check on the shared network level.
CfgSharedNetworks4Ptr cfg_networks = cfg->getCfgSharedNetworks4();
if (cfg_networks->hasSubnetWithServerId(server_id)) {
if (cfg_networks->hasNetworkWithServerId(server_id)) {
return (true);
......@@ -13,7 +13,7 @@ namespace isc {
namespace dhcp {
CfgSharedNetworks4::hasSubnetWithServerId(const IOAddress& server_id) const {
CfgSharedNetworks4::hasNetworkWithServerId(const IOAddress& server_id) const {
const auto& index = networks_.get<SharedNetworkServerIdIndexTag>();
auto network_it = index.find(server_id);
return (network_it != index.cend());
......@@ -119,7 +119,7 @@ public:
/// @param server_id Server identifier.
/// @return true if there is a network with a specified server identifier.
bool hasSubnetWithServerId(const asiolink::IOAddress& server_id) const;
bool hasNetworkWithServerId(const asiolink::IOAddress& server_id) const;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment