commit 9ca5c8ecf21048733db5dfb84fdfb4135bb4e1be
author William A. Kennington III <wak@google.com> Wed Dec 14 14:40:52 2022 -0800
committer William A. Kennington III <wak@google.com> Mon Jun 26 16:51:20 2023 -0700
tree 74154de3ab518634aa68746a4e6eb9c6092b344b
parent d4ff731e20735f8b1e97a10d51d30a449b695f3f

ethernet_interface: Empty address also deletes the gateway

Since the address is invalid anyway, this is a straightforward way to
clear the entry.

Change-Id: I7c130d0e3c3c0d182e8a7c54d53be44b4ffe47a7
Signed-off-by: William A. Kennington III <wak@google.com>

src/ethernet_interface.cpp

diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index c6cc1b9..e7a2c29 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -820,7 +820,13 @@
     }
     try
     {
-        gw = stdplus::toStr(stdplus::fromStr<Addr>(gw));
+        auto ip = stdplus::fromStr<Addr>(gw);
+        if (ip == Addr{})
+        {
+            gw.clear();
+            return;
+        }
+        gw = stdplus::toStr(ip);
     }
     catch (const std::exception& e)
     {

test/test_ethernet_interface.cpp

diff --git a/test/test_ethernet_interface.cpp b/test/test_ethernet_interface.cpp
index c92b8eb..4156506 100644
--- a/test/test_ethernet_interface.cpp
+++ b/test/test_ethernet_interface.cpp
@@ -176,6 +176,8 @@
     EXPECT_EQ(interface.defaultGateway(), gateway);
     interface.defaultGateway("");
     EXPECT_EQ(interface.defaultGateway(), "");
+    interface.defaultGateway("0.0.0.0");
+    EXPECT_EQ(interface.defaultGateway(), "");
 }
 
 TEST_F(TestEthernetInterface, addGateway6)
@@ -185,6 +187,8 @@
     EXPECT_EQ(interface.defaultGateway6(), gateway6);
     interface.defaultGateway6("");
     EXPECT_EQ(interface.defaultGateway6(), "");
+    interface.defaultGateway6("::");
+    EXPECT_EQ(interface.defaultGateway6(), "");
 }
 
 TEST_F(TestEthernetInterface, DHCPEnabled)