From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 16 Nov 2021 06:11:15 +0000 (+0900)
Subject: network: address: use route_scope_from_string()
X-Git-Tag: v250-rc1~244^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8c472f2976fbbf3be224a81ed92264c73cf8208;p=thirdparty%2Fsystemd.git

network: address: use route_scope_from_string()
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 5ef38bc4769..e0f3bd3b1b0 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -14,6 +14,7 @@
 #include "networkd-manager.h"
 #include "networkd-network.h"
 #include "networkd-queue.h"
+#include "networkd-route-util.h"
 #include "networkd-route.h"
 #include "parse-util.h"
 #include "string-util.h"
@@ -1770,21 +1771,14 @@ int config_parse_address_scope(
                 return 0;
         }
 
-        if (streq(rvalue, "host"))
-                n->scope = RT_SCOPE_HOST;
-        else if (streq(rvalue, "link"))
-                n->scope = RT_SCOPE_LINK;
-        else if (streq(rvalue, "global"))
-                n->scope = RT_SCOPE_UNIVERSE;
-        else {
-                r = safe_atou8(rvalue , &n->scope);
-                if (r < 0) {
-                        log_syntax(unit, LOG_WARNING, filename, line, r,
-                                   "Could not parse address scope \"%s\", ignoring assignment: %m", rvalue);
-                        return 0;
-                }
+        r = route_scope_from_string(rvalue);
+        if (r < 0) {
+                log_syntax(unit, LOG_WARNING, filename, line, r,
+                           "Could not parse address scope \"%s\", ignoring assignment: %m", rvalue);
+                return 0;
         }
 
+        n->scope = r;
         n->scope_set = true;
         TAKE_PTR(n);
         return 0;