From 5d538bb78e1820a807a8670cd3075757f2e115f0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 7 Oct 2012 19:16:31 +0200 Subject: Periodically update selected nexthops --- ffd/announce.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ffd/announce.c') diff --git a/ffd/announce.c b/ffd/announce.c index 8911feb..99bf1aa 100644 --- a/ffd/announce.c +++ b/ffd/announce.c @@ -34,6 +34,9 @@ static ffd_nexthop_t* select_nexthop(const ffd_announce_t *announce) { ffd_nexthop_t *nexthop; for (nexthop = announce->nexthop_list; nexthop; nexthop = nexthop->next) { + if (!nexthop->neigh) /* local */ + return nexthop; + if (!ffd_is_feasible(announce, nexthop->metric_seqno)) continue; @@ -59,19 +62,19 @@ ffd_metric_seqno_t get_metric(const ffd_announce_t *announce) { return (ffd_metric_seqno_t){0xffff, 0}; } -static inline void update_selected(ffd_announce_t *announce) { +void ffd_announce_update(ffd_announce_t *announce) { announce->selected = select_nexthop(announce); announce->metric = get_metric(announce); } -void ffd_announce_update(ffd_announce_t *announce, ffd_nexthop_t *nexthop, ffd_metric_seqno_t ms, uint16_t interval) { +void ffd_announce_update_nexthop(ffd_announce_t *announce, ffd_nexthop_t *nexthop, ffd_metric_seqno_t ms, uint16_t interval) { nexthop->metric_seqno = ms; nexthop->interval = interval; if (ms.metric != 0xffff) nexthop->last_update = now; - update_selected(announce); + ffd_announce_update(announce); } ffd_announce_t* ffd_announce_new(void) { -- cgit v1.2.3