From cbe91b3cba3298866f51abfa598c5751e90fd390 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 22 Oct 2015 17:34:58 +0200 Subject: [PATCH] sd-ndisc: reduce callbacks Only callback on error when the statemachine is in a truly broken state. This is now only the case when we fail to rearm a timer. --- src/libsystemd-network/sd-ndisc.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c index fd512b5..a361662 100644 --- a/src/libsystemd-network/sd-ndisc.c +++ b/src/libsystemd-network/sd-ndisc.c @@ -540,11 +540,7 @@ static int ndisc_router_solicitation_timeout(sd_event_source *s, uint64_t usec, nd->nd_sent++; - r = sd_event_now(nd->event, clock_boottime_or_monotonic(), &time_now); - if (r < 0) { - ndisc_notify(nd, r); - return 0; - } + assert_se(sd_event_now(nd->event, clock_boottime_or_monotonic(), &time_now) >= 0); next_timeout = time_now + NDISC_ROUTER_SOLICITATION_INTERVAL; @@ -556,18 +552,13 @@ static int ndisc_router_solicitation_timeout(sd_event_source *s, uint64_t usec, return 0; } - r = sd_event_source_set_priority(nd->timeout, - nd->event_priority); - if (r < 0) { - ndisc_notify(nd, r); + r = sd_event_source_set_priority(nd->timeout, nd->event_priority); + if (r < 0) return 0; - } r = sd_event_source_set_description(nd->timeout, "ndisc-timeout"); - if (r < 0) { - ndisc_notify(nd, r); + if (r < 0) return 0; - } } return 0; -- 2.7.4