From: Maria Matejka <mq@ucw.cz>
Date: Tue, 30 Jan 2024 20:29:00 +0000 (+0100)
Subject: Fixed regression in route feeding.
X-Git-Tag: v3.0.0~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95adf7b0fa0c0c764f34d064797c5b3f25680b98;p=thirdparty%2Fbird.git

Fixed regression in route feeding.

We were, once again, forgetting to mark empty-net journal entries as
processed, as was fixed in 32bb548c116b40f79d077c10356c037770ed1005.

Introduced in 548dbb2252e80362789b8c98355f468491d47b34.
Caught by cf-ebgp-graceful.
---

diff --git a/nest/rt-table.c b/nest/rt-table.c
index ec1cd71c5..80a1c2259 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4280,10 +4280,16 @@ rt_feed_by_fib(void *data)
     for (; c->feed_index < tab->routes_block_size; c->feed_index++)
     {
       net *n = &tab->routes[c->feed_index];
-      if (!n->routes)
+      const net_addr *a;
+      if (n->routes)
+	a = n->routes->rte.net;
+      else if (!n->first)
 	continue;
+      else if (n->first->old)
+	a = n->first->old->rte.net;
+      else
+	a = n->first->new->rte.net;
 
-      const net_addr *a = n->routes->rte.net;
       if (rt_prefilter_net(&c->h.req->prefilter, a))
       {
 	if (!rt_prepare_feed(c, n, &block))