Babel: Do not maintain feasibility distance for our own routes

We do not need to maintain feasibility distances for our own router
ID (we ignore the updates anyway). Not doing so makes the routes be
garbage collected sooner when export filters change.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 3b3b98702f59ad82d36ea83d16db10fa9763b78c..8164f2f3c287612e5ca2890790771ef71e49c45c 100644 (file)
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -788,16 +788,21 @@ babel_send_update(struct babel_iface *ifa, bird_clock_t changed)
     msg.update.prefix = e->n.prefix;
     msg.update.router_id = r->router_id;
 
-    /* Update feasibility distance */
-    struct babel_source *s = babel_get_source(e, r->router_id);
-    s->expires = now + BABEL_GARBAGE_INTERVAL;
-    if ((msg.update.seqno > s->seqno) ||
-       ((msg.update.seqno == s->seqno) && (msg.update.metric < s->metric)))
+    babel_enqueue(&msg, ifa);
+
+    /* Update feasibility distance for redistributed routes */
+    if (!OUR_ROUTE(r))
     {
-      s->seqno = msg.update.seqno;
-      s->metric = msg.update.metric;
+      struct babel_source *s = babel_get_source(e, r->router_id);
+      s->expires = now + BABEL_GARBAGE_INTERVAL;
+
+      if ((msg.update.seqno > s->seqno) ||
+         ((msg.update.seqno == s->seqno) && (msg.update.metric < s->metric)))
+      {
+       s->seqno = msg.update.seqno;
+       s->metric = msg.update.metric;
+      }
     }
-    babel_enqueue(&msg, ifa);
   }
   FIB_WALK_END;
 }