shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-09-21 09:44:58 +03:00
Code Activity

Merge pull request #21383 from yuwata/network-address-scope

Browse Source 
network: use route_scope_from_string() at one more place
This commit is contained in:
Lennart Poettering
2021-11-16 16:53:26 +01:00
committed by GitHub
parent 31f5c84dfc faa201dc6b
commit 91822de4f6
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/networkd-address.c
View File

@@ -14,6 +14,7 @@
#include "networkd-manager.h" #include "networkd-manager.h"
#include "networkd-network.h" #include "networkd-network.h"
#include "networkd-queue.h" #include "networkd-queue.h"
#include "networkd-route-util.h"
#include "networkd-route.h" #include "networkd-route.h"
#include "parse-util.h" #include "parse-util.h"
#include "string-util.h" #include "string-util.h"
@@ -1770,21 +1771,14 @@ int config_parse_address_scope(
return 0; return 0;
} }
if (streq(rvalue, "host")) r = route_scope_from_string(rvalue);
n->scope = RT_SCOPE_HOST; if (r < 0) {
else if (streq(rvalue, "link")) log_syntax(unit, LOG_WARNING, filename, line, r,
n->scope = RT_SCOPE_LINK; "Could not parse address scope \"%s\", ignoring assignment: %m", rvalue);
else if (streq(rvalue, "global")) return 0;
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;
}
} }
n->scope = r;
n->scope_set = true; n->scope_set = true;
TAKE_PTR(n); TAKE_PTR(n);
return 0; return 0;
@@ -1924,8 +1918,8 @@ static int address_section_verify(Address *address) {
if (address->scope_set && address->scope != RT_SCOPE_HOST) if (address->scope_set && address->scope != RT_SCOPE_HOST)
log_warning_errno(SYNTHETIC_ERRNO(EINVAL), log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: non-host scope is set in the [Address] section from line %u. " "%s: non-host scope is set for localhost address. "
"Ignoring Scope= setting.", "Ignoring Scope= setting in the [Address] section from line %u. ",
address->section->filename, address->section->line); address->section->filename, address->section->line);
address->scope = RT_SCOPE_HOST; address->scope = RT_SCOPE_HOST;