Table export: Another inconsistency in refeeds

When a route has been already sent to the channel and the refeed
runs because of a filter change or just because requested, the
old and new routes are the same which was actually not anticipated
by rt_notify_basic().

diff --git a/nest/rt-table.c b/nest/rt-table.c
index d1ffd40213d069ac2b253712d1b94be9019bf068..ca808ea42c545618c606c437786ef4c8c129662e 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1178,17 +1178,28 @@ rt_notify_basic(struct channel *c, const rte *new, const rte *old)
     return;
   }
 
-  /* If this is a refeed, we may need to copy the new route to the old one */
-  if (!old && bmap_test(&c->export_accepted_map, new->id))
+  /* Have we exported the old route? */
+  if (old)
   {
-    if (rt_export_get_state(&c->out_req) == TES_PARTIAL)
-      old = new;
-    else
-      log(L_WARN "%s.%s: Got new route for %N (id %u) which is already marked accepted, weird",
-         c->proto->name, c->name, new->net, new->id);
+    /* If the old route exists, it is either in rejected or in accepted map. */
+    int rejected = bmap_test(&c->export_rejected_map, old->id);
+    int accepted = bmap_test(&c->export_accepted_map, old->id);
+    ASSERT_DIE(rejected != accepted);
+
+    if (rejected)
+    {
+      /* Drop the old rejected bit from the map, the old route id
+       * gets released after exports. */
+      bmap_clear(&c->export_rejected_map, old->id);
+
+      /* Treat old rejected as never seen. */
+      old = NULL;
+    }
+
+    /* Accepted bit is dropped in do_rt_notify() */
   }
 
-  /* Run the filters, actually */
+  /* Run the filters for the new route */
   rte n0, *np = NULL;
   if (new)
   {
@@ -1196,20 +1207,6 @@ rt_notify_basic(struct channel *c, const rte *new, const rte *old)
     np = export_filter(c, &n0, 0);
   }
 
-  /* Have we exported the old route? */
-  if (old)
-    /* If the old route exists, it is either in rejected or in accepted map.
-     * If it is in rejcted map, we clear it right now, if it is in accepted map,
-     * we get rid of it in do_rt_notify. */
-    if (bmap_test(&c->export_rejected_map, old->id))
-    {
-      ASSERT_DIE(!bmap_test(&c->export_accepted_map, old->id));
-      bmap_clear(&c->export_rejected_map, old->id);
-      old = NULL;
-    }
-    else
-      ASSERT_DIE(bmap_test(&c->export_accepted_map, old->id));
-
   /* Withdraw to withdraw. */
   if (!np && !old)
   {
@@ -1521,6 +1518,21 @@ channel_notify_basic(void *_channel)
                  old = &u->feed->block[o];
                }
 
+           /* Check new flags */
+           int nacc = bmap_test(&c->export_accepted_map, new->id);
+           int nrej = bmap_test(&c->export_rejected_map, new->id);
+
+           if (old)
+             ASSERT_DIE(!nacc && !nrej);
+
+           else if (nacc || nrej)
+           {
+             /* In case of refeed, the new route may actually have already
+              * been processed and thus it's also old */
+             old = new;
+             ASSERT_DIE(!nacc != !nrej);
+           }
+
            /* This is the distilled notification */
            rt_notify_basic(c, new, old);
            notify_count++;