From fd0834262c517ea3a420fdba05fb95bc4141762b Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 13 Apr 2020 16:44:09 -0400 Subject: dhcp: fix unicast pkts, clean up state machine Nominally a bug-fix cherry-pick, but completely manual. Closer to a full feature backport minus binary api changes. Send dhcp unicast packets to ip4-lookup. Otherwise, these packets won't reach a dhcp server on a different subnet. Do an immediate client scan after processing wakeup events. Calculate the next process wakeup time by scanning all clients. Increase maximum (idle, no-clients-configured) timeout to 1000 seconds. Reduce log spew. Type: fix Signed-off-by: Dave Barach Change-Id: I3d10cd4c353298ed0b19e7e30887dc1d8d07b19e (cherry picked from commit c54162981cdd41d65ed283df36955007552ddffe) --- test/test_dhcp.py | 1 + 1 file changed, 1 insertion(+) (limited to 'test/test_dhcp.py') diff --git a/test/test_dhcp.py b/test/test_dhcp.py index 175f6493eb7..5d9c89d5f38 100644 --- a/test/test_dhcp.py +++ b/test/test_dhcp.py @@ -242,6 +242,7 @@ class TestDHCP(VppTestCase): self.verify_dhcp_msg_type(pkt, "discover") self.verify_dhcp_has_option(pkt, "hostname", hostname) if client_id: + client_id = '\x00' + client_id self.verify_dhcp_has_option(pkt, "client_id", client_id) bootp = pkt[BOOTP] self.assertEqual(bootp.ciaddr, "0.0.0.0") -- cgit 1.2.3-korg