diff options
author | Luca Boccassi <bluca@debian.org> | 2022-10-11 21:58:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-11 21:58:26 +0200 |
commit | dd4212105e49b830d4c77169991dfab4e113613f (patch) | |
tree | 0347acb6bd3cd66766bdec5ef4e94f8e871cecab /src/libsystemd-network | |
parent | da6018275903434ced990eb956423bc70e61796b (diff) | |
parent | abb977a61aebd88df573c692e3307bd31cfd6f1c (diff) | |
download | systemd-dd4212105e49b830d4c77169991dfab4e113613f.tar.gz |
Merge pull request #24957 from yuwata/network-ignore-failure-in-sending-solicitation
network: ignore failure in sending solicitation
Diffstat (limited to 'src/libsystemd-network')
-rw-r--r-- | src/libsystemd-network/sd-ndisc.c | 13 | ||||
-rw-r--r-- | src/libsystemd-network/sd-radv.c | 8 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c index 276370ef05..2cf0cebdeb 100644 --- a/src/libsystemd-network/sd-ndisc.c +++ b/src/libsystemd-network/sd-ndisc.c @@ -286,13 +286,12 @@ static int ndisc_timeout(sd_event_source *s, uint64_t usec, void *userdata) { goto fail; r = icmp6_send_router_solicitation(nd->fd, &nd->mac_addr); - if (r < 0) { - log_ndisc_errno(nd, r, "Error sending Router Solicitation: %m"); - goto fail; - } - - log_ndisc(nd, "Sent Router Solicitation, next solicitation in %s", - FORMAT_TIMESPAN(nd->retransmit_time, USEC_PER_SEC)); + if (r < 0) + log_ndisc_errno(nd, r, "Failed to send Router Solicitation, next solicitation in %s, ignoring: %m", + FORMAT_TIMESPAN(nd->retransmit_time, USEC_PER_SEC)); + else + log_ndisc(nd, "Sent Router Solicitation, next solicitation in %s", + FORMAT_TIMESPAN(nd->retransmit_time, USEC_PER_SEC)); return 0; diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index 6611746a58..a3a5a21b3d 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -322,7 +322,7 @@ static int radv_timeout(sd_event_source *s, uint64_t usec, void *userdata) { r = radv_send(ra, NULL, ra->lifetime_usec); if (r < 0) - log_radv_errno(ra, r, "Unable to send Router Advertisement: %m"); + log_radv_errno(ra, r, "Unable to send Router Advertisement, ignoring: %m"); /* RFC 4861, Section 6.2.4, sending initial Router Advertisements */ if (ra->ra_sent < RADV_MAX_INITIAL_RTR_ADVERTISEMENTS) @@ -384,7 +384,7 @@ int sd_radv_stop(sd_radv *ra) { with zero lifetime */ r = radv_send(ra, NULL, 0); if (r < 0) - log_radv_errno(ra, r, "Unable to send last Router Advertisement with router lifetime set to zero: %m"); + log_radv_errno(ra, r, "Unable to send last Router Advertisement with router lifetime set to zero, ignoring: %m"); radv_reset(ra); ra->fd = safe_close(ra->fd); @@ -638,7 +638,7 @@ int sd_radv_add_prefix(sd_radv *ra, sd_radv_prefix *p) { /* If RAs have already been sent, send an RA immediately to announce the newly-added prefix */ r = radv_send(ra, NULL, ra->lifetime_usec); if (r < 0) - log_radv_errno(ra, r, "Unable to send Router Advertisement for added prefix %s: %m", addr_p); + log_radv_errno(ra, r, "Unable to send Router Advertisement for added prefix %s, ignoring: %m", addr_p); else log_radv(ra, "Sent Router Advertisement for added/updated prefix %s.", addr_p); @@ -734,7 +734,7 @@ int sd_radv_add_route_prefix(sd_radv *ra, sd_radv_route_prefix *p) { /* If RAs have already been sent, send an RA immediately to announce the newly-added route prefix */ r = radv_send(ra, NULL, ra->lifetime_usec); if (r < 0) - log_radv_errno(ra, r, "Unable to send Router Advertisement for added route prefix %s: %m", + log_radv_errno(ra, r, "Unable to send Router Advertisement for added route prefix %s, ignoring: %m", strna(addr_p)); else log_radv(ra, "Sent Router Advertisement for added route prefix %s.", strna(addr_p)); |