system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11837 from yuwata/network-tiny-cleanups

Browse source 
network: tiny cleanups
This commit is contained in:
Lennart Poettering 2019-02-27 11:26:47 +01:00 committed by GitHub
parent 1c73b06926 80be3de31f
commit 7bd90528b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/network/networkd-ndisc.c
View file

@ -493,7 +493,7 @@ static void ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
}
}
static void ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
static int ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
int r;
assert(link);
@ -503,18 +503,14 @@ static void ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
for (;;) {
uint8_t type;
if (r < 0) {
log_link_warning_errno(link, r, "Failed to iterate through options: %m");
return;
}
if (r < 0)
return log_link_warning_errno(link, r, "Failed to iterate through options: %m");
if (r == 0) /* EOF */
break;
r = sd_ndisc_router_option_get_type(rt, &type);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to get RA option type: %m");
return;
}
if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA option type: %m");
switch (type) {
@ -522,18 +518,16 @@ static void ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
uint8_t flags;
r = sd_ndisc_router_prefix_get_flags(rt, &flags);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to get RA prefix flags: %m");
return;
}
if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA prefix flags: %m");
if (link->network->ipv6_accept_ra_use_onlink_prefix)
if (flags & ND_OPT_PI_FLAG_ONLINK)
(void) ndisc_router_process_onlink_prefix(link, rt);
if (link->network->ipv6_accept_ra_use_onlink_prefix &&
FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK))
(void) ndisc_router_process_onlink_prefix(link, rt);
if (link->network->ipv6_accept_ra_use_autonomous_prefix)
if (flags & ND_OPT_PI_FLAG_AUTO)
(void) ndisc_router_process_autonomous_prefix(link, rt);
if (link->network->ipv6_accept_ra_use_autonomous_prefix &&
FLAGS_SET(flags, ND_OPT_PI_FLAG_AUTO))
(void) ndisc_router_process_autonomous_prefix(link, rt);
break;
}
@ -555,6 +549,8 @@ static void ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
r = sd_ndisc_router_option_next(rt);
}
return 0;
}
static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
@ -581,8 +577,8 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
}
}
ndisc_router_process_default(link, rt);
ndisc_router_process_options(link, rt);
(void) ndisc_router_process_default(link, rt);
(void) ndisc_router_process_options(link, rt);
return r;
}

2
src/network/networkd-network.c
View file

@ -1507,7 +1507,7 @@ int config_parse_dhcp_user_class(
break;
if (strlen(w) > 255) {
log_syntax(unit, LOG_ERR, filename, line, r,
log_syntax(unit, LOG_ERR, filename, line, 0,
"%s length is not in the range 1-255, ignoring.", w);
continue;
}