unsigned preference;
uint32_t mtu;
usec_t time_now;
- int r;
Address *address;
Iterator i;
+ int r;
assert(link);
assert(rt);
r = sd_ndisc_router_get_lifetime(rt, &lifetime);
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 */
return 0;
r = sd_ndisc_router_get_address(rt, &gateway.in6);
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) {
if (address->family != AF_INET6)
continue;
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);
- log_link_debug(link, "No NDisc route added, gateway %s matches local address",
- strnull(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",
+ strnull(buffer));
+ }
return 0;
}
}
if (address->family != AF_INET6)
continue;
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);
- log_link_debug(link, "No NDisc route added, gateway %s matches local address",
- strnull(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",
+ strnull(buffer));
+ }
return 0;
}
}
r = sd_ndisc_router_get_preference(rt, &preference);
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);
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);
if (r == -ENODATA)
mtu = 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);
if (r < 0)
- return log_link_error_errno(link, r, "Could not allocate route: %m");
+ return log_oom();
route->family = AF_INET6;
route->table = link_get_ipv6_accept_ra_route_table(link);
route->mtu = mtu;
r = route_configure(route, link, ndisc_route_handler);
- if (r < 0) {
- log_link_warning_errno(link, r, "Could not set default route: %m");
- link_enter_failed(link);
- return r;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Could not set default route: %m");
if (r > 0)
link->ndisc_routes_messages++;
route_gw->gw = gateway;
r = route_configure(route_gw, link, ndisc_route_handler);
- if (r < 0) {
- log_link_error_errno(link, r, "Could not set gateway: %m");
- link_enter_failed(link);
- return r;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Could not set gateway: %m");
if (r > 0)
link->ndisc_routes_messages++;
}
r = set_put(addresses, new_address);
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);
}
}
r = set_put(addresses, new_address);
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);
}
_cleanup_(address_freep) Address *address = NULL;
unsigned prefixlen;
usec_t time_now;
- Address *existing_address, *a;
+ Address *a;
Iterator i;
int r;
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
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);
if (r < 0)
r = address_new(&address);
if (r < 0)
- return log_link_error_errno(link, r, "Could not allocate address: %m");
+ return log_oom();
address->family = AF_INET6;
r = sd_ndisc_router_prefix_get_address(rt, &address->in_addr.in6);
r = ndisc_router_generate_addresses(link, prefixlen, lifetime_preferred, address, &addresses);
if (r < 0)
- return log_link_error_errno(link, r, "Failed to generate SLAAC addresses: %m");
+ return r;
SET_FOREACH(a, addresses, i) {
+ Address *existing_address;
+
/* see RFC4862 section 5.5.3.e */
r = address_get(link, a->family, &a->in_addr, a->prefixlen, &existing_address);
if (r > 0) {
continue;
r = address_configure(a, link, ndisc_address_handler, true);
- if (r < 0) {
- log_link_warning_errno(link, r, "Could not set SLAAC address: %m");
- link_enter_failed(link);
- return r;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Could not set SLAAC address: %m");
if (r > 0)
link->ndisc_addresses_messages++;
}
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
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);
if (r < 0)
r = route_new(&route);
if (r < 0)
- return log_link_error_errno(link, r, "Could not allocate route: %m");
+ return log_oom();
route->family = AF_INET6;
route->table = link_get_ipv6_accept_ra_route_table(link);
return log_link_error_errno(link, r, "Failed to get prefix address: %m");
r = route_configure(route, link, ndisc_route_handler);
- if (r < 0) {
- log_link_warning_errno(link, r, "Could not set prefix route: %m");
- link_enter_failed(link);
- return r;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Could not set prefix route: %m");;
if (r > 0)
link->ndisc_routes_messages++;
r = sd_ndisc_router_route_get_lifetime(rt, &lifetime);
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)
return 0;
r = sd_ndisc_router_get_address(rt, &gateway);
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);
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);
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);
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);
if (r < 0)
- return log_link_error_errno(link, r, "Could not allocate route: %m");
+ return log_oom();
route->family = AF_INET6;
route->table = link_get_ipv6_accept_ra_route_table(link);
return log_link_error_errno(link, r, "Failed to get route address: %m");
r = route_configure(route, link, ndisc_route_handler);
- if (r < 0) {
- log_link_warning_errno(link, r, "Could not set additional route: %m");
- link_enter_failed(link);
- return r;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Could not set additional route: %m");
if (r > 0)
link->ndisc_routes_messages++;
uint32_t lifetime;
const struct in6_addr *a;
usec_t time_now;
- int i, n, r;
+ int n, r;
assert(link);
assert(rt);
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
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);
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);
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;
NDiscRDNSS d = {
.address = a[i],
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;
uint32_t lifetime;
usec_t time_now;
assert(rt);
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
- if (r < 0) {
- log_link_warning_errno(link, r, "Failed to get RA timestamp: %m");
- return;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
r = sd_ndisc_router_dnssl_get_lifetime(rt, &lifetime);
- if (r < 0) {
- log_link_warning_errno(link, r, "Failed to get RDNSS lifetime: %m");
- return;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Failed to get DNSSL lifetime: %m");
r = sd_ndisc_router_dnssl_get_domains(rt, &l);
- if (r < 0) {
- log_link_warning_errno(link, r, "Failed to get RDNSS addresses: %m");
- return;
- }
+ if (r < 0)
+ return log_link_error_errno(link, r, "Failed to get DNSSL addresses: %m");
STRV_FOREACH(i, l) {
- _cleanup_free_ NDiscDNSSL *s;
+ _cleanup_free_ NDiscDNSSL *s = NULL;
NDiscDNSSL *x;
s = malloc0(ALIGN(sizeof(NDiscDNSSL)) + strlen(*i) + 1);
- if (!s) {
- log_oom();
- return;
- }
+ if (!s)
+ return log_oom();
strcpy(NDISC_DNSSL_DOMAIN(s), *i);
s->valid_until = time_now + lifetime * USEC_PER_SEC;
r = set_ensure_consume(&link->ndisc_dnssl, &ndisc_dnssl_hash_ops, TAKE_PTR(s));
- if (r < 0) {
- log_oom();
- return;
- }
+ if (r < 0)
+ return log_oom();
assert(r > 0);
link_dirty(link);
}
+
+ return 0;
}
static int ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
- int r;
-
assert(link);
assert(link->network);
assert(rt);
- r = sd_ndisc_router_option_rewind(rt);
- for (;;) {
+ for (int r = sd_ndisc_router_option_rewind(rt); ; r = sd_ndisc_router_option_next(rt)) {
uint8_t type;
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 */
- break;
+ return 0;
r = sd_ndisc_router_option_get_type(rt, &type);
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) {
(void) in_addr_to_string(AF_INET6, &a, &b);
log_link_debug(link, "Prefix '%s' is deny-listed, ignoring", strna(b));
}
-
break;
}
r = sd_ndisc_router_prefix_get_flags(rt, &flags);
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 &&
- FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK))
- (void) ndisc_router_process_onlink_prefix(link, rt);
+ FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK)) {
+ r = ndisc_router_process_onlink_prefix(link, rt);
+ if (r < 0)
+ return r;
+ }
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);
-
+ FLAGS_SET(flags, ND_OPT_PI_FLAG_AUTO)) {
+ r = ndisc_router_process_autonomous_prefix(link, rt);
+ if (r < 0)
+ return r;
+ }
break;
}
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;
case SD_NDISC_OPTION_RDNSS:
- if (link->network->ipv6_accept_ra_use_dns)
- (void) ndisc_router_process_rdnss(link, rt);
+ if (link->network->ipv6_accept_ra_use_dns) {
+ r = ndisc_router_process_rdnss(link, rt);
+ if (r < 0)
+ return r;
+ }
break;
case SD_NDISC_OPTION_DNSSL:
- if (link->network->ipv6_accept_ra_use_dns)
- (void) ndisc_router_process_dnssl(link, rt);
+ if (link->network->ipv6_accept_ra_use_dns) {
+ r = ndisc_router_process_dnssl(link, rt);
+ if (r < 0)
+ return r;
+ }
break;
}
-
- r = sd_ndisc_router_option_next(rt);
}
-
- return 0;
}
static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
r = sd_ndisc_router_get_flags(rt, &flags);
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)) {
else
/* (re)start DHCPv6 client in stateful or stateless mode according to RA flags */
r = dhcp6_request_address(link, !(flags & ND_RA_FLAG_MANAGED));
-
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 {
log_link_debug(link, "Acquiring DHCPv6 lease on NDisc request");
r = 0;
}
}
- (void) ndisc_router_process_default(link, rt);
- (void) ndisc_router_process_options(link, rt);
+ r = ndisc_router_process_default(link, rt);
+ if (r < 0)
+ return r;
+ r = ndisc_router_process_options(link, rt);
+ if (r < 0)
+ return r;
return r;
}
static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *rt, void *userdata) {
Link *link = userdata;
+ int r;
assert(link);
link->ndisc_addresses_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)
link->ndisc_addresses_configured = true;
break;
default:
- log_link_warning(link, "IPv6 Neighbor Discovery unknown event: %d", event);
+ assert_not_reached("IPv6 Neighbor Discovery unknown event");
}
}
projects / thirdparty / systemd.git / commitdiff
