commit c9f672e41b8a12b9f3f503d60873a1c8376892f7
author William A. Kennington III <wak@google.com> Fri Nov 04 14:35:53 2022 -0700
committer William A. Kennington III <wak@google.com> Wed Nov 09 12:35:29 2022 -0800
tree 120fce4cc48d56f5318739d1f8e4bb69df108c14
parent f6f0cf39137e9d02bbbf3eacacf9469bd9b2d181

ethernet_interface: Normalize IPs for nameservers

Change-Id: I44956d59aa7a93468c84715da16c39df50efb2d9
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 4398926..76bbe78 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -563,15 +563,19 @@
 
 ServerList EthernetInterface::staticNameServers(ServerList value)
 {
-    for (const auto& nameserverip : value)
+    for (auto& ip : value)
     {
-        if (!isValidIP(nameserverip))
+        try
         {
-            log<level::ERR>("Not a valid IP address"),
-                entry("ADDRESS=%s", nameserverip.c_str());
-            elog<InvalidArgument>(
-                Argument::ARGUMENT_NAME("StaticNameserver"),
-                Argument::ARGUMENT_VALUE(nameserverip.c_str()));
+            ip = std::to_string(ToAddr<InAddrAny>{}(ip));
+        }
+        catch (const std::exception& e)
+        {
+            auto msg =
+                fmt::format("Not a valid IP address `{}`: {}", ip, e.what());
+            log<level::ERR>(msg.c_str()), entry("ADDRESS=%s", ip.c_str());
+            elog<InvalidArgument>(Argument::ARGUMENT_NAME("StaticNameserver"),
+                                  Argument::ARGUMENT_VALUE(ip.c_str()));
         }
     }
     try