diff options
| -rw-r--r-- | src/lib/dhcpsrv/cfg_subnets4.cc | 12 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/cfg_subnets6.cc | 6 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/dhcpsrv_messages.cc | 36 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/dhcpsrv_messages.h | 18 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/dhcpsrv_messages.mes | 52 |
5 files changed, 62 insertions, 62 deletions
diff --git a/src/lib/dhcpsrv/cfg_subnets4.cc b/src/lib/dhcpsrv/cfg_subnets4.cc index 3a32d6baa4..2f160b655d 100644 --- a/src/lib/dhcpsrv/cfg_subnets4.cc +++ b/src/lib/dhcpsrv/cfg_subnets4.cc @@ -300,7 +300,7 @@ CfgSubnets4::selectSubnet(const SubnetSelector& selector) const { selector.client_classes_)); } else { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET4_SELECT_FAILED_NO_RAI_OPTIONS_ADDRESS); + DHCPSRV_SUBNET4_SELECT_NO_RAI_OPTIONS); } // If relayed message has been received, try to match the giaddr with the @@ -337,11 +337,11 @@ CfgSubnets4::selectSubnet(const SubnetSelector& selector) const { } } LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_FAILED) + DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_NO_MATCH) .arg(selector.giaddr_.toText()); } else { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET4_SELECT_FAILED_NO_RELAY_ADDRESS); + DHCPSRV_SUBNET4_SELECT_NO_RELAY_ADDRESS); } // If we got to this point it means that we were not able to match the @@ -394,7 +394,7 @@ CfgSubnets4::selectSubnet(const SubnetSelector& selector) const { // Unable to find a suitable address to use for subnet selection. if (address.isV4Zero()) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET4_SELECT_FAILED_NO_ADDRESS); + DHCPSRV_SUBNET4_SELECT_NO_USABLE_ADDRESS); return (Subnet4Ptr()); } @@ -441,7 +441,7 @@ CfgSubnets4::selectSubnet(const std::string& iface, } LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_FAILED) + DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_NO_MATCH) .arg(iface); // Failed to find a subnet. @@ -480,7 +480,7 @@ CfgSubnets4::selectSubnet(const IOAddress& address, } LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_FAILED) + DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_NO_MATCH) .arg(address.toText()); // Failed to find a subnet. diff --git a/src/lib/dhcpsrv/cfg_subnets6.cc b/src/lib/dhcpsrv/cfg_subnets6.cc index d2c1322c18..dd564109d1 100644 --- a/src/lib/dhcpsrv/cfg_subnets6.cc +++ b/src/lib/dhcpsrv/cfg_subnets6.cc @@ -305,7 +305,7 @@ CfgSubnets6::selectSubnet(const asiolink::IOAddress& address, } LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_FAILED) + DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_NO_MATCH) .arg(address.toText()); // Nothing found. @@ -333,7 +333,7 @@ CfgSubnets6::selectSubnet(const std::string& iface_name, } LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_FAILED) + DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_NO_MATCH) .arg(iface_name); // No subnet found for this interface name. @@ -362,7 +362,7 @@ CfgSubnets6::selectSubnet(const OptionPtr& interface_id, } LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_FAILED) + DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_NO_MATCH) .arg(interface_id->toText()); } diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc index efb6ddede3..a8bae75492 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.cc +++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc @@ -218,15 +218,15 @@ extern const isc::log::MessageID DHCPSRV_QUEUE_NCR = "DHCPSRV_QUEUE_NCR"; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_FAILED = "DHCPSRV_QUEUE_NCR_FAILED"; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_SKIP = "DHCPSRV_QUEUE_NCR_SKIP"; extern const isc::log::MessageID DHCPSRV_SUBNET4O6_SELECT_FAILED = "DHCPSRV_SUBNET4O6_SELECT_FAILED"; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_FAILED = "DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_FAILED"; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_FAILED = "DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_FAILED"; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_FAILED = "DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_FAILED"; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_FAILED_NO_ADDRESS = "DHCPSRV_SUBNET4_SELECT_FAILED_NO_ADDRESS"; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_FAILED_NO_RAI_OPTIONS_ADDRESS = "DHCPSRV_SUBNET4_SELECT_FAILED_NO_RAI_OPTIONS_ADDRESS"; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_FAILED_NO_RELAY_ADDRESS = "DHCPSRV_SUBNET4_SELECT_FAILED_NO_RELAY_ADDRESS"; -extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_FAILED = "DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_FAILED"; -extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_FAILED = "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_FAILED"; -extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_FAILED = "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_FAILED"; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_NO_MATCH = "DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_NO_MATCH"; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_NO_MATCH = "DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_NO_MATCH"; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_NO_MATCH = "DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_NO_MATCH"; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_NO_RAI_OPTIONS = "DHCPSRV_SUBNET4_SELECT_NO_RAI_OPTIONS"; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_NO_RELAY_ADDRESS = "DHCPSRV_SUBNET4_SELECT_NO_RELAY_ADDRESS"; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_NO_USABLE_ADDRESS = "DHCPSRV_SUBNET4_SELECT_NO_USABLE_ADDRESS"; +extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_NO_MATCH = "DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_NO_MATCH"; +extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_NO_MATCH = "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_NO_MATCH"; +extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_NO_MATCH = "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_NO_MATCH"; extern const isc::log::MessageID DHCPSRV_TIMERMGR_CALLBACK_FAILED = "DHCPSRV_TIMERMGR_CALLBACK_FAILED"; extern const isc::log::MessageID DHCPSRV_TIMERMGR_REGISTER_TIMER = "DHCPSRV_TIMERMGR_REGISTER_TIMER"; extern const isc::log::MessageID DHCPSRV_TIMERMGR_RUN_TIMER_OPERATION = "DHCPSRV_TIMERMGR_RUN_TIMER_OPERATION"; @@ -454,15 +454,15 @@ const char* values[] = { "DHCPSRV_QUEUE_NCR_FAILED", "%1: queuing %2 name change request failed for lease %3: %4", "DHCPSRV_QUEUE_NCR_SKIP", "%1: skip queuing name change request for lease: %2", "DHCPSRV_SUBNET4O6_SELECT_FAILED", "Failed to select any subnet for the DHCPv4o6 packet", - "DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_FAILED", "Failed to select any subnet using address: %1", - "DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_FAILED", "Failed to select any subnet using interface: %1", - "DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_FAILED", "Failed to select any subnet using relay address: %1", - "DHCPSRV_SUBNET4_SELECT_FAILED_NO_ADDRESS", "Failed to select any subnet because no suitable address to use for subnet selection was found.", - "DHCPSRV_SUBNET4_SELECT_FAILED_NO_RAI_OPTIONS_ADDRESS", "Failed to select any subnet because no suitable address to use for subnet selection was found in the relay supplied options.", - "DHCPSRV_SUBNET4_SELECT_FAILED_NO_RELAY_ADDRESS", "Failed to select any subnet because no relay address to use for subnet selection was found.", - "DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_FAILED", "Failed to select any subnet using address: %1", - "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_FAILED", "Failed to select any subnet using interface: %1", - "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_FAILED", "Failed to select any subnet using interface-id: %1", + "DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_NO_MATCH", "No subnet matches address: %1", + "DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_NO_MATCH", "No subnet matches interface: %1", + "DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_NO_MATCH", "No subnet matches relay address: %1", + "DHCPSRV_SUBNET4_SELECT_NO_RAI_OPTIONS", "No RAI options found to use for subnet selection.", + "DHCPSRV_SUBNET4_SELECT_NO_RELAY_ADDRESS", "Relay address (giaddr) in client packet is empty.", + "DHCPSRV_SUBNET4_SELECT_NO_USABLE_ADDRESS", "No subnet selected because no suitable address to use for subnet selection was found.", + "DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_NO_MATCH", "No subnet matches address: %1", + "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_NO_MATCH", "No subnet matches interface id: %1", + "DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_NO_MATCH", "No subnet matches interface: %1", "DHCPSRV_TIMERMGR_CALLBACK_FAILED", "running handler for timer %1 caused exception: %2", "DHCPSRV_TIMERMGR_REGISTER_TIMER", "registering timer: %1, using interval: %2 ms", "DHCPSRV_TIMERMGR_RUN_TIMER_OPERATION", "running operation for timer: %1", diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h index 48280f6edb..de72a098a5 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.h +++ b/src/lib/dhcpsrv/dhcpsrv_messages.h @@ -219,15 +219,15 @@ extern const isc::log::MessageID DHCPSRV_QUEUE_NCR; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_FAILED; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_SKIP; extern const isc::log::MessageID DHCPSRV_SUBNET4O6_SELECT_FAILED; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_FAILED; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_FAILED; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_FAILED; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_FAILED_NO_ADDRESS; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_FAILED_NO_RAI_OPTIONS_ADDRESS; -extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_FAILED_NO_RELAY_ADDRESS; -extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_FAILED; -extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_FAILED; -extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_FAILED; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_NO_MATCH; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_NO_MATCH; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_NO_MATCH; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_NO_RAI_OPTIONS; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_NO_RELAY_ADDRESS; +extern const isc::log::MessageID DHCPSRV_SUBNET4_SELECT_NO_USABLE_ADDRESS; +extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_NO_MATCH; +extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_NO_MATCH; +extern const isc::log::MessageID DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_NO_MATCH; extern const isc::log::MessageID DHCPSRV_TIMERMGR_CALLBACK_FAILED; extern const isc::log::MessageID DHCPSRV_TIMERMGR_REGISTER_TIMER; extern const isc::log::MessageID DHCPSRV_TIMERMGR_RUN_TIMER_OPERATION; diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index 1401945107..6fa8dc8669 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -1099,41 +1099,41 @@ information. The second argument includes the leased address. A debug message issued when the server was unable to select any subnet for the DHCPv4o6 packet. -% DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_FAILED Failed to select any subnet using address: %1 -A debug message issued when the server was unable to select any subnet using -specified address. +% DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_NO_MATCH No subnet matches address: %1 +A debug message issued when the server was unable to select a subnet using +the specified address. -% DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_FAILED Failed to select any subnet using interface: %1 -A debug message issued when the server was unable to select any subnet using -specified interface name. +% DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_NO_MATCH No subnet matches interface: %1 +A debug message issued when the server was unable to select a subnet using +the specified interface name. -% DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_FAILED Failed to select any subnet using relay address: %1 -A debug message issued when the server was unable to select any subnet using +% DHCPSRV_SUBNET4_SELECT_BY_RELAY_ADDRESS_NO_MATCH No subnet matches relay address: %1 +A debug message issued when the server was unable to select a subnet using the specified relay address. -% DHCPSRV_SUBNET4_SELECT_FAILED_NO_ADDRESS Failed to select any subnet because no suitable address to use for subnet selection was found. -A debug message issued when the server was unable to select any subnet because -no suitable address to use for subnet selection was found. +% DHCPSRV_SUBNET4_SELECT_NO_USABLE_ADDRESS No subnet selected because no suitable address to use for subnet selection was found. +A debug message issued when the server was find a suitable address to use for +susubnet selection. -% DHCPSRV_SUBNET4_SELECT_FAILED_NO_RAI_OPTIONS_ADDRESS Failed to select any subnet because no suitable address to use for subnet selection was found in the relay supplied options. -A debug message issued when the server was unable to select any subnet because -no suitable address to use for subnet selection was found in the relay supplied options. +% DHCPSRV_SUBNET4_SELECT_NO_RAI_OPTIONS No RAI options found to use for subnet selection. +A debug message issued by the server when the client query does not include RAI +options suitable for use with subnet selection. -% DHCPSRV_SUBNET4_SELECT_FAILED_NO_RELAY_ADDRESS Failed to select any subnet because no relay address to use for subnet selection was found. -A debug message issued when the server was unable to select any subnet because -no relay address to use for subnet selection was found. +% DHCPSRV_SUBNET4_SELECT_NO_RELAY_ADDRESS Relay address (giaddr) in client packet is empty. +A debug message issued when no relay address was specified to use for subnet +selection. -% DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_FAILED Failed to select any subnet using address: %1 -A debug message issued when the server was unable to select any subnet using -specified address. +% DHCPSRV_SUBNET6_SELECT_BY_ADDRESS_NO_MATCH No subnet matches address: %1 +A debug message issued when the server was unable to select a subnet using +the specified address. -% DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_FAILED Failed to select any subnet using interface: %1 -A debug message issued when the server was unable to select any subnet using -specified interface name. +% DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_NO_MATCH No subnet matches interface: %1 +A debug message issued when the server was unable to select a subnet using +the specified interface name. -% DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_FAILED Failed to select any subnet using interface-id: %1 -A debug message issued when the server was unable to select any subnet using -specified interface id. +% DHCPSRV_SUBNET6_SELECT_BY_INTERFACE_ID_NO_MATCH No subnet matches interface id: %1 +A debug message issued when the server was unable to select a subnet using +the specified interface id. % DHCPSRV_TIMERMGR_CALLBACK_FAILED running handler for timer %1 caused exception: %2 This error message is emitted when the timer elapsed and the |