[#4674] Ported warning fix

diff --git a/changelog_unreleased/4674-dhcp_receive4_unknown-warnings b/changelog_unreleased/4674-dhcp_receive4_unknown-warnings
new file mode 100644 (file)
index 0000000..9091473
--- /dev/null
+++ b/changelog_unreleased/4674-dhcp_receive4_unknown-warnings
@@ -0,0 +1,6 @@
+[bug]          fdupont
+       Removed spurious DHCP_RECEIVE4_UNKNOWN and
+       DHCP_RECEIVE6_UNKNOWN warnings sent for instance
+       when a command is received. This bug was introduced
+       in 3.2.0 release.
+       (Gitlab #4674)

diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index 2c4fc7e2fd4fcfb9fd0895211c398a7f93e79fd5..c90301a1a0a1e5ed50394bb40b03c5831146a818 100644 (file)
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -1508,7 +1508,9 @@ Pkt4Ptr IfaceMgr::receive4Direct(uint32_t timeout_sec, uint32_t timeout_usec /*
     }
 
     if (!candidate || !recv_if) {
-        LOG_WARN(dhcp_logger, DHCP_RECEIVE4_UNKNOWN);
+        if (!found) {
+            LOG_WARN(dhcp_logger, DHCP_RECEIVE4_UNKNOWN);
+        }
         return (Pkt4Ptr());
     }
 
@@ -1678,7 +1680,9 @@ IfaceMgr::receive6Direct(uint32_t timeout_sec, uint32_t timeout_usec /* = 0 */ )
     }
 
     if (!candidate) {
-        LOG_WARN(dhcp_logger, DHCP_RECEIVE6_UNKNOWN);
+        if (!found) {
+            LOG_WARN(dhcp_logger, DHCP_RECEIVE6_UNKNOWN);
+        }
         return (Pkt6Ptr());
     }