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

Merge pull request #24957 from yuwata/network-ignore-failure-in-sending-solicitation

Browse Source 
network: ignore failure in sending solicitation
This commit is contained in:
Luca Boccassi 2022-10-11 21:58:26 +02:00 committed by GitHub
commit dd4212105e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libsystemd-network/sd-ndisc.c
View File

@ -286,13 +286,12 @@ static int ndisc_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
goto fail; goto fail;
r = icmp6_send_router_solicitation(nd->fd, &nd->mac_addr); r = icmp6_send_router_solicitation(nd->fd, &nd->mac_addr);
if (r < 0) { if (r < 0)
log_ndisc_errno(nd, r, "Error sending Router Solicitation: %m"); log_ndisc_errno(nd, r, "Failed to send Router Solicitation, next solicitation in %s, ignoring: %m",
goto fail; FORMAT_TIMESPAN(nd->retransmit_time, USEC_PER_SEC));
} else
log_ndisc(nd, "Sent Router Solicitation, next solicitation in %s",
log_ndisc(nd, "Sent Router Solicitation, next solicitation in %s", FORMAT_TIMESPAN(nd->retransmit_time, USEC_PER_SEC));
FORMAT_TIMESPAN(nd->retransmit_time, USEC_PER_SEC));
return 0; return 0;

8
src/libsystemd-network/sd-radv.c
View File

@ -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); r = radv_send(ra, NULL, ra->lifetime_usec);
if (r < 0) 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 */ /* RFC 4861, Section 6.2.4, sending initial Router Advertisements */
if (ra->ra_sent < RADV_MAX_INITIAL_RTR_ADVERTISEMENTS) if (ra->ra_sent < RADV_MAX_INITIAL_RTR_ADVERTISEMENTS)
@ -384,7 +384,7 @@ int sd_radv_stop(sd_radv *ra) {
with zero lifetime */ with zero lifetime */
r = radv_send(ra, NULL, 0); r = radv_send(ra, NULL, 0);
if (r < 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); radv_reset(ra);
ra->fd = safe_close(ra->fd); 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 */ /* If RAs have already been sent, send an RA immediately to announce the newly-added prefix */
r = radv_send(ra, NULL, ra->lifetime_usec); r = radv_send(ra, NULL, ra->lifetime_usec);
if (r < 0) 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 else
log_radv(ra, "Sent Router Advertisement for added/updated prefix %s.", addr_p); 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 */ /* 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); r = radv_send(ra, NULL, ra->lifetime_usec);
if (r < 0) 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)); strna(addr_p));
else else
log_radv(ra, "Sent Router Advertisement for added route prefix %s.", strna(addr_p)); log_radv(ra, "Sent Router Advertisement for added route prefix %s.", strna(addr_p));