SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-ndisc: stop discovery properly when something fails

Browse Source
This commit is contained in:
Lennart Poettering
2016-05-26 15:34:43 +02:00
parent 901c983b6d
commit b9e7b1cf06
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-ndisc.c
+13 -7
View File
@@ -608,9 +608,10 @@ static int ndisc_router_solicitation_timeout(sd_event_source *s, uint64_t usec,
nd->state = NDISC_STATE_ADVERTISEMENT_LISTEN;
} else {
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");
else {
goto fail;
} else {
nd->state = NDISC_STATE_SOLICITATION_SENT;
log_ndisc(nd, "Sent Router Solicitation");
}
@@ -625,19 +626,24 @@ static int ndisc_router_solicitation_timeout(sd_event_source *s, uint64_t usec,
next_timeout, 0,
ndisc_router_solicitation_timeout, nd);
if (r < 0) {
/* we cannot continue if we are unable to rearm the timer */
sd_ndisc_stop(nd);
return 0;
log_ndisc_errno(nd, r, "Failed to allocate timer event: %m");
goto fail;
}
r = sd_event_source_set_priority(nd->timeout_event_source, nd->event_priority);
if (r < 0)
return 0;
if (r < 0) {
log_ndisc_errno(nd, r, "Cannot set timer priority: %m");
goto fail;
}
(void) sd_event_source_set_description(nd->timeout_event_source, "ndisc-timeout");
}
return 0;
fail:
sd_ndisc_stop(nd);
return 0;
}
int sd_ndisc_stop(sd_ndisc *nd) {