From d8c472f2976fbbf3be224a81ed92264c73cf8208 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 16 Nov 2021 15:11:15 +0900 Subject: network: address: use route_scope_from_string() --- src/network/networkd-address.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 5ef38bc476..e0f3bd3b1b 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; -- cgit v1.2.1 From faa201dc6b17db14ee6192a7b6fde49c2ac35a82 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 16 Nov 2021 15:16:14 +0900 Subject: network: address: explicitly mention that the address is localhost --- src/network/networkd-address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index e0f3bd3b1b..a78ad6d93b 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -1918,8 +1918,8 @@ static int address_section_verify(Address *address) { if (address->scope_set && address->scope != RT_SCOPE_HOST) log_warning_errno(SYNTHETIC_ERRNO(EINVAL), - "%s: non-host scope is set in the [Address] section from line %u. " - "Ignoring Scope= setting.", + "%s: non-host scope is set for localhost address. " + "Ignoring Scope= setting in the [Address] section from line %u. ", address->section->filename, address->section->line); address->scope = RT_SCOPE_HOST; -- cgit v1.2.1