shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-07 21:18:41 +03:00
Code

network: ndisc: any failures in processing event make the link in failed state

Browse Source 
Also adjust log levels.
This commit is contained in:
Yu Watanabe 2020-07-17 01:13:17 +09:00
parent c97785168b
commit 13e8a49a58
1 changed files with 107 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
src/network/networkd-ndisc.c
View File

@ -148,33 +148,35 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
unsigned preference; unsigned preference;
uint32_t mtu; uint32_t mtu;
usec_t time_now; usec_t time_now;
int r;
Address *address; Address *address;
Iterator i; Iterator i;
int r;
assert(link); assert(link);
assert(rt); assert(rt);
r = sd_ndisc_router_get_lifetime(rt, &lifetime); r = sd_ndisc_router_get_lifetime(rt, &lifetime);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get gateway address from RA: %m"); return log_link_error_errno(link, r, "Failed to get gateway lifetime from RA: %m");
if (lifetime == 0) /* not a default router */ if (lifetime == 0) /* not a default router */
return 0; return 0;
r = sd_ndisc_router_get_address(rt, &gateway.in6); r = sd_ndisc_router_get_address(rt, &gateway.in6);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get gateway address from RA: %m"); return log_link_error_errno(link, r, "Failed to get gateway address from RA: %m");
SET_FOREACH(address, link->addresses, i) { SET_FOREACH(address, link->addresses, i) {
if (address->family != AF_INET6) if (address->family != AF_INET6)
continue; continue;
if (in_addr_equal(AF_INET6, &gateway, &address->in_addr)) { if (in_addr_equal(AF_INET6, &gateway, &address->in_addr)) {
_cleanup_free_ char *buffer = NULL; if (DEBUG_LOGGING) {
_cleanup_free_ char *buffer = NULL;
(void) in_addr_to_string(AF_INET6, &address->in_addr, &buffer); (void) in_addr_to_string(AF_INET6, &address->in_addr, &buffer);
log_link_debug(link, "No NDisc route added, gateway %s matches local address", log_link_debug(link, "No NDisc route added, gateway %s matches local address",
strnull(buffer)); strnull(buffer));
}
return 0; return 0;
} }
} }
@ -183,32 +185,34 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
if (address->family != AF_INET6) if (address->family != AF_INET6)
continue; continue;
if (in_addr_equal(AF_INET6, &gateway, &address->in_addr)) { if (in_addr_equal(AF_INET6, &gateway, &address->in_addr)) {
_cleanup_free_ char *buffer = NULL; if (DEBUG_LOGGING) {
_cleanup_free_ char *buffer = NULL;
(void) in_addr_to_string(AF_INET6, &address->in_addr, &buffer); (void) in_addr_to_string(AF_INET6, &address->in_addr, &buffer);
log_link_debug(link, "No NDisc route added, gateway %s matches local address", log_link_debug(link, "No NDisc route added, gateway %s matches local address",
strnull(buffer)); strnull(buffer));
}
return 0; return 0;
} }
} }
r = sd_ndisc_router_get_preference(rt, &preference); r = sd_ndisc_router_get_preference(rt, &preference);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get default router preference from RA: %m"); return log_link_error_errno(link, r, "Failed to get default router preference from RA: %m");
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now); r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA timestamp: %m"); return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
r = sd_ndisc_router_get_mtu(rt, &mtu); r = sd_ndisc_router_get_mtu(rt, &mtu);
if (r == -ENODATA) if (r == -ENODATA)
mtu = 0; mtu = 0;
else if (r < 0) else if (r < 0)
return log_link_warning_errno(link, r, "Failed to get default router MTU from RA: %m"); return log_link_error_errno(link, r, "Failed to get default router MTU from RA: %m");
r = route_new(&route); r = route_new(&route);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Could not allocate route: %m"); return log_oom();
route->family = AF_INET6; route->family = AF_INET6;
route->table = link_get_ipv6_accept_ra_route_table(link); route->table = link_get_ipv6_accept_ra_route_table(link);
@ -220,11 +224,8 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
route->mtu = mtu; route->mtu = mtu;
r = route_configure(route, link, ndisc_route_handler); r = route_configure(route, link, ndisc_route_handler);
if (r < 0) { if (r < 0)
log_link_warning_errno(link, r, "Could not set default route: %m"); return log_link_error_errno(link, r, "Could not set default route: %m");
link_enter_failed(link);
return r;
}
if (r > 0) if (r > 0)
link->ndisc_routes_messages++; link->ndisc_routes_messages++;
@ -239,11 +240,8 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
route_gw->gw = gateway; route_gw->gw = gateway;
r = route_configure(route_gw, link, ndisc_route_handler); r = route_configure(route_gw, link, ndisc_route_handler);
if (r < 0) { if (r < 0)
log_link_error_errno(link, r, "Could not set gateway: %m"); return log_link_error_errno(link, r, "Could not set gateway: %m");
link_enter_failed(link);
return r;
}
if (r > 0) if (r > 0)
link->ndisc_routes_messages++; link->ndisc_routes_messages++;
} }
@ -306,7 +304,7 @@ static int ndisc_router_generate_addresses(Link *link, unsigned prefixlen, uint3
r = set_put(addresses, new_address); r = set_put(addresses, new_address);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to store address: %m"); return log_link_error_errno(link, r, "Failed to store SLAAC address: %m");
TAKE_PTR(new_address); TAKE_PTR(new_address);
} }
} }
@ -331,7 +329,7 @@ static int ndisc_router_generate_addresses(Link *link, unsigned prefixlen, uint3
r = set_put(addresses, new_address); r = set_put(addresses, new_address);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to store address: %m"); return log_link_error_errno(link, r, "Failed to store SLAAC address: %m");
TAKE_PTR(new_address); TAKE_PTR(new_address);
} }
@ -346,7 +344,7 @@ static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *r
_cleanup_(address_freep) Address *address = NULL; _cleanup_(address_freep) Address *address = NULL;
unsigned prefixlen; unsigned prefixlen;
usec_t time_now; usec_t time_now;
Address *existing_address, *a; Address *a;
Iterator i; Iterator i;
int r; int r;
@ -355,7 +353,7 @@ static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *r
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now); r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA timestamp: %m"); return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
r = sd_ndisc_router_prefix_get_prefixlen(rt, &prefixlen); r = sd_ndisc_router_prefix_get_prefixlen(rt, &prefixlen);
if (r < 0) if (r < 0)
@ -375,7 +373,7 @@ static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *r
r = address_new(&address); r = address_new(&address);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Could not allocate address: %m"); return log_oom();
address->family = AF_INET6; address->family = AF_INET6;
r = sd_ndisc_router_prefix_get_address(rt, &address->in_addr.in6); r = sd_ndisc_router_prefix_get_address(rt, &address->in_addr.in6);
@ -384,9 +382,11 @@ static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *r
r = ndisc_router_generate_addresses(link, prefixlen, lifetime_preferred, address, &addresses); r = ndisc_router_generate_addresses(link, prefixlen, lifetime_preferred, address, &addresses);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Failed to generate SLAAC addresses: %m"); return r;
SET_FOREACH(a, addresses, i) { SET_FOREACH(a, addresses, i) {
Address *existing_address;
/* see RFC4862 section 5.5.3.e */ /* see RFC4862 section 5.5.3.e */
r = address_get(link, a->family, &a->in_addr, a->prefixlen, &existing_address); r = address_get(link, a->family, &a->in_addr, a->prefixlen, &existing_address);
if (r > 0) { if (r > 0) {
@ -406,11 +406,8 @@ static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *r
continue; continue;
r = address_configure(a, link, ndisc_address_handler, true); r = address_configure(a, link, ndisc_address_handler, true);
if (r < 0) { if (r < 0)
log_link_warning_errno(link, r, "Could not set SLAAC address: %m"); return log_link_error_errno(link, r, "Could not set SLAAC address: %m");
link_enter_failed(link);
return r;
}
if (r > 0) if (r > 0)
link->ndisc_addresses_messages++; link->ndisc_addresses_messages++;
} }
@ -430,7 +427,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now); r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA timestamp: %m"); return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
r = sd_ndisc_router_prefix_get_prefixlen(rt, &prefixlen); r = sd_ndisc_router_prefix_get_prefixlen(rt, &prefixlen);
if (r < 0) if (r < 0)
@ -442,7 +439,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
r = route_new(&route); r = route_new(&route);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Could not allocate route: %m"); return log_oom();
route->family = AF_INET6; route->family = AF_INET6;
route->table = link_get_ipv6_accept_ra_route_table(link); route->table = link_get_ipv6_accept_ra_route_table(link);
@ -457,11 +454,8 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
return log_link_error_errno(link, r, "Failed to get prefix address: %m"); return log_link_error_errno(link, r, "Failed to get prefix address: %m");
r = route_configure(route, link, ndisc_route_handler); r = route_configure(route, link, ndisc_route_handler);
if (r < 0) { if (r < 0)
log_link_warning_errno(link, r, "Could not set prefix route: %m"); return log_link_error_errno(link, r, "Could not set prefix route: %m");;
link_enter_failed(link);
return r;
}
if (r > 0) if (r > 0)
link->ndisc_routes_messages++; link->ndisc_routes_messages++;
@ -480,30 +474,30 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) {
r = sd_ndisc_router_route_get_lifetime(rt, &lifetime); r = sd_ndisc_router_route_get_lifetime(rt, &lifetime);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get gateway address from RA: %m"); return log_link_error_errno(link, r, "Failed to get gateway lifetime from RA: %m");
if (lifetime == 0) if (lifetime == 0)
return 0; return 0;
r = sd_ndisc_router_get_address(rt, &gateway); r = sd_ndisc_router_get_address(rt, &gateway);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get gateway address from RA: %m"); return log_link_error_errno(link, r, "Failed to get gateway address from RA: %m");
r = sd_ndisc_router_route_get_prefixlen(rt, &prefixlen); r = sd_ndisc_router_route_get_prefixlen(rt, &prefixlen);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get route prefix length: %m"); return log_link_error_errno(link, r, "Failed to get route prefix length: %m");
r = sd_ndisc_router_route_get_preference(rt, &preference); r = sd_ndisc_router_route_get_preference(rt, &preference);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get default router preference from RA: %m"); return log_link_error_errno(link, r, "Failed to get default router preference from RA: %m");
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now); r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA timestamp: %m"); return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
r = route_new(&route); r = route_new(&route);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Could not allocate route: %m"); return log_oom();
route->family = AF_INET6; route->family = AF_INET6;
route->table = link_get_ipv6_accept_ra_route_table(link); route->table = link_get_ipv6_accept_ra_route_table(link);
@ -519,11 +513,8 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) {
return log_link_error_errno(link, r, "Failed to get route address: %m"); return log_link_error_errno(link, r, "Failed to get route address: %m");
r = route_configure(route, link, ndisc_route_handler); r = route_configure(route, link, ndisc_route_handler);
if (r < 0) { if (r < 0)
log_link_warning_errno(link, r, "Could not set additional route: %m"); return log_link_error_errno(link, r, "Could not set additional route: %m");
link_enter_failed(link);
return r;
}
if (r > 0) if (r > 0)
link->ndisc_routes_messages++; link->ndisc_routes_messages++;
@ -544,24 +535,24 @@ static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) {
uint32_t lifetime; uint32_t lifetime;
const struct in6_addr *a; const struct in6_addr *a;
usec_t time_now; usec_t time_now;
int i, n, r; int n, r;
assert(link); assert(link);
assert(rt); assert(rt);
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now); r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA timestamp: %m"); return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
r = sd_ndisc_router_rdnss_get_lifetime(rt, &lifetime); r = sd_ndisc_router_rdnss_get_lifetime(rt, &lifetime);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RDNSS lifetime: %m"); return log_link_error_errno(link, r, "Failed to get RDNSS lifetime: %m");
n = sd_ndisc_router_rdnss_get_addresses(rt, &a); n = sd_ndisc_router_rdnss_get_addresses(rt, &a);
if (n < 0) if (n < 0)
return log_link_warning_errno(link, n, "Failed to get RDNSS addresses: %m"); return log_link_error_errno(link, n, "Failed to get RDNSS addresses: %m");
for (i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
_cleanup_free_ NDiscRDNSS *x = NULL; _cleanup_free_ NDiscRDNSS *x = NULL;
NDiscRDNSS d = { NDiscRDNSS d = {
.address = a[i], .address = a[i],
@ -616,7 +607,7 @@ static int ndisc_dnssl_compare_func(const NDiscDNSSL *a, const NDiscDNSSL *b) {
DEFINE_PRIVATE_HASH_OPS(ndisc_dnssl_hash_ops, NDiscDNSSL, ndisc_dnssl_hash_func, ndisc_dnssl_compare_func); DEFINE_PRIVATE_HASH_OPS(ndisc_dnssl_hash_ops, NDiscDNSSL, ndisc_dnssl_hash_func, ndisc_dnssl_compare_func);
static void ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) { static int ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
_cleanup_strv_free_ char **l = NULL; _cleanup_strv_free_ char **l = NULL;
uint32_t lifetime; uint32_t lifetime;
usec_t time_now; usec_t time_now;
@ -627,32 +618,24 @@ static void ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
assert(rt); assert(rt);
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now); r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
if (r < 0) { if (r < 0)
log_link_warning_errno(link, r, "Failed to get RA timestamp: %m"); return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
return;
}
r = sd_ndisc_router_dnssl_get_lifetime(rt, &lifetime); r = sd_ndisc_router_dnssl_get_lifetime(rt, &lifetime);
if (r < 0) { if (r < 0)
log_link_warning_errno(link, r, "Failed to get RDNSS lifetime: %m"); return log_link_error_errno(link, r, "Failed to get DNSSL lifetime: %m");
return;
}
r = sd_ndisc_router_dnssl_get_domains(rt, &l); r = sd_ndisc_router_dnssl_get_domains(rt, &l);
if (r < 0) { if (r < 0)
log_link_warning_errno(link, r, "Failed to get RDNSS addresses: %m"); return log_link_error_errno(link, r, "Failed to get DNSSL addresses: %m");
return;
}
STRV_FOREACH(i, l) { STRV_FOREACH(i, l) {
_cleanup_free_ NDiscDNSSL *s; _cleanup_free_ NDiscDNSSL *s = NULL;
NDiscDNSSL *x; NDiscDNSSL *x;
s = malloc0(ALIGN(sizeof(NDiscDNSSL)) + strlen(*i) + 1); s = malloc0(ALIGN(sizeof(NDiscDNSSL)) + strlen(*i) + 1);
if (!s) { if (!s)
log_oom(); return log_oom();
return;
}
strcpy(NDISC_DNSSL_DOMAIN(s), *i); strcpy(NDISC_DNSSL_DOMAIN(s), *i);
@ -678,35 +661,32 @@ static void ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
s->valid_until = time_now + lifetime * USEC_PER_SEC; s->valid_until = time_now + lifetime * USEC_PER_SEC;
r = set_ensure_consume(&link->ndisc_dnssl, &ndisc_dnssl_hash_ops, TAKE_PTR(s)); r = set_ensure_consume(&link->ndisc_dnssl, &ndisc_dnssl_hash_ops, TAKE_PTR(s));
if (r < 0) { if (r < 0)
log_oom(); return log_oom();
return;
}
assert(r > 0); assert(r > 0);
link_dirty(link); link_dirty(link);
} }
return 0;
} }
static int 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); assert(link);
assert(link->network); assert(link->network);
assert(rt); assert(rt);
r = sd_ndisc_router_option_rewind(rt); for (int r = sd_ndisc_router_option_rewind(rt); ; r = sd_ndisc_router_option_next(rt)) {
for (;;) {
uint8_t type; uint8_t type;
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to iterate through options: %m"); return log_link_error_errno(link, r, "Failed to iterate through options: %m");
if (r == 0) /* EOF */ if (r == 0) /* EOF */
break; return 0;
r = sd_ndisc_router_option_get_type(rt, &type); r = sd_ndisc_router_option_get_type(rt, &type);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA option type: %m"); return log_link_error_errno(link, r, "Failed to get RA option type: %m");
switch (type) { switch (type) {
@ -725,44 +705,52 @@ static int ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
(void) in_addr_to_string(AF_INET6, &a, &b); (void) in_addr_to_string(AF_INET6, &a, &b);
log_link_debug(link, "Prefix '%s' is deny-listed, ignoring", strna(b)); log_link_debug(link, "Prefix '%s' is deny-listed, ignoring", strna(b));
} }
break; break;
} }
r = sd_ndisc_router_prefix_get_flags(rt, &flags); r = sd_ndisc_router_prefix_get_flags(rt, &flags);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA prefix flags: %m"); return log_link_error_errno(link, r, "Failed to get RA prefix flags: %m");
if (link->network->ipv6_accept_ra_use_onlink_prefix && if (link->network->ipv6_accept_ra_use_onlink_prefix &&
FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK)) FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK)) {
(void) ndisc_router_process_onlink_prefix(link, rt); r = ndisc_router_process_onlink_prefix(link, rt);
if (r < 0)
return r;
}
if (link->network->ipv6_accept_ra_use_autonomous_prefix && if (link->network->ipv6_accept_ra_use_autonomous_prefix &&
FLAGS_SET(flags, ND_OPT_PI_FLAG_AUTO)) FLAGS_SET(flags, ND_OPT_PI_FLAG_AUTO)) {
(void) ndisc_router_process_autonomous_prefix(link, rt); r = ndisc_router_process_autonomous_prefix(link, rt);
if (r < 0)
return r;
}
break; break;
} }
case SD_NDISC_OPTION_ROUTE_INFORMATION: case SD_NDISC_OPTION_ROUTE_INFORMATION:
(void) ndisc_router_process_route(link, rt); r = ndisc_router_process_route(link, rt);
if (r < 0)
return r;
break; break;
case SD_NDISC_OPTION_RDNSS: case SD_NDISC_OPTION_RDNSS:
if (link->network->ipv6_accept_ra_use_dns) if (link->network->ipv6_accept_ra_use_dns) {
(void) ndisc_router_process_rdnss(link, rt); r = ndisc_router_process_rdnss(link, rt);
if (r < 0)
return r;
}
break; break;
case SD_NDISC_OPTION_DNSSL: case SD_NDISC_OPTION_DNSSL:
if (link->network->ipv6_accept_ra_use_dns) if (link->network->ipv6_accept_ra_use_dns) {
(void) ndisc_router_process_dnssl(link, rt); r = ndisc_router_process_dnssl(link, rt);
if (r < 0)
return r;
}
break; break;
} }
r = sd_ndisc_router_option_next(rt);
} }
return 0;
} }
static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) { static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
@ -776,7 +764,7 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
r = sd_ndisc_router_get_flags(rt, &flags); r = sd_ndisc_router_get_flags(rt, &flags);
if (r < 0) if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA flags: %m"); return log_link_error_errno(link, r, "Failed to get RA flags: %m");
if ((flags & (ND_RA_FLAG_MANAGED | ND_RA_FLAG_OTHER) && link->network->ipv6_accept_ra_start_dhcp6_client)) { if ((flags & (ND_RA_FLAG_MANAGED | ND_RA_FLAG_OTHER) && link->network->ipv6_accept_ra_start_dhcp6_client)) {
@ -785,23 +773,27 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
else else
/* (re)start DHCPv6 client in stateful or stateless mode according to RA flags */ /* (re)start DHCPv6 client in stateful or stateless mode according to RA flags */
r = dhcp6_request_address(link, !(flags & ND_RA_FLAG_MANAGED)); r = dhcp6_request_address(link, !(flags & ND_RA_FLAG_MANAGED));
if (r < 0 && r != -EBUSY) if (r < 0 && r != -EBUSY)
log_link_warning_errno(link, r, "Could not acquire DHCPv6 lease on NDisc request: %m"); return log_link_error_errno(link, r, "Could not acquire DHCPv6 lease on NDisc request: %m");
else { else {
log_link_debug(link, "Acquiring DHCPv6 lease on NDisc request"); log_link_debug(link, "Acquiring DHCPv6 lease on NDisc request");
r = 0; r = 0;
} }
} }
(void) ndisc_router_process_default(link, rt); r = ndisc_router_process_default(link, rt);
(void) ndisc_router_process_options(link, rt); if (r < 0)
return r;
r = ndisc_router_process_options(link, rt);
if (r < 0)
return r;
return r; return r;
} }
static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *rt, void *userdata) { static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *rt, void *userdata) {
Link *link = userdata; Link *link = userdata;
int r;
assert(link); assert(link);
@ -814,7 +806,11 @@ static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r
link->ndisc_addresses_configured = false; link->ndisc_addresses_configured = false;
link->ndisc_routes_configured = false; link->ndisc_routes_configured = false;
(void) ndisc_router_handler(link, rt); r = ndisc_router_handler(link, rt);
if (r < 0) {
link_enter_failed(link);
return;
}
if (link->ndisc_addresses_messages == 0) if (link->ndisc_addresses_messages == 0)
link->ndisc_addresses_configured = true; link->ndisc_addresses_configured = true;
@ -847,7 +843,7 @@ static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r
break; break;
default: default:
log_link_warning(link, "IPv6 Neighbor Discovery unknown event: %d", event); assert_not_reached("IPv6 Neighbor Discovery unknown event");
} }
} }