bgpd: fix do not use api.backup_nexthop in ZAPI message

The backup_nexthop entry list has been populated by mistake,
and should not. Fix this by reverting the introduced behavior.

Fixes: 237ebf8d4503 ("bgpd: rework bgp_zebra_announce() function, separate nexthop handling")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
(cherry picked from commit d4390fc21795b09b84a6b95b1f8fa1ac2b3dcda9)

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 8fab0d1c055df6ea00d62c578af64d6e545cf4cb..6f8f4610ca9a571ec8a87b4b3a4b72b79eaf48b1 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1331,10 +1331,7 @@ static void bgp_zebra_announce_parse_nexthop(
                                                         &nh_weight))
                                continue;
                }
-               if (CHECK_FLAG(info->flags, BGP_PATH_SELECTED))
-                       api_nh = &api->nexthops[*valid_nh_count];
-               else
-                       api_nh = &api->backup_nexthops[*valid_nh_count];
+               api_nh = &api->nexthops[*valid_nh_count];
 
                api_nh->srte_color = bgp_attr_get_color(info->attr);