proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 14:17:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Drop unnecessary is_add check for bgp_zebra_announce_actual()

Browse Source 
Fixes: ccfe452763 ("bgpd : backpressure - Handle BGP-Zebra Install evt Creation")

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-07-07 18:42:08 +03:00
parent d7d491537a
commit d7144594ca
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bgpd/bgp_zebra.c
View File

@ -1556,7 +1556,6 @@ bgp_zebra_announce_actual(struct bgp_dest *dest, struct bgp_path_info *info,
struct peer *peer; struct peer *peer;
uint32_t metric; uint32_t metric;
route_tag_t tag; route_tag_t tag;
bool is_add;
uint32_t nhg_id = 0; uint32_t nhg_id = 0;
struct bgp_table *table = bgp_dest_table(dest); struct bgp_table *table = bgp_dest_table(dest);
const struct prefix *p = bgp_dest_get_prefix(dest); const struct prefix *p = bgp_dest_get_prefix(dest);
@ -1610,9 +1609,7 @@ bgp_zebra_announce_actual(struct bgp_dest *dest, struct bgp_path_info *info,
table->afi, table->safi, &nhg_id, table->afi, table->safi, &nhg_id,
&metric, &tag, &allow_recursion); &metric, &tag, &allow_recursion);
is_add = (valid_nh_count || nhg_id) ? true : false; if (CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA)) {
if (is_add && CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA)) {
struct bgp_zebra_opaque bzo = {}; struct bgp_zebra_opaque bzo = {};
const char *reason = const char *reason =
bgp_path_selection_reason2str(dest->reason); bgp_path_selection_reason2str(dest->reason);
@ -1668,18 +1665,17 @@ bgp_zebra_announce_actual(struct bgp_dest *dest, struct bgp_path_info *info,
} }
if (bgp_debug_zebra(p)) { if (bgp_debug_zebra(p)) {
zlog_debug("Tx route %s %s %pFX metric %u tag %" ROUTE_TAG_PRI zlog_debug("Tx route add %s %pFX metric %u tag %" ROUTE_TAG_PRI
" count %d nhg %d", " count %d nhg %d",
is_add ? "add" : "delete", bgp->name_pretty, bgp->name_pretty, &api.prefix, api.metric, api.tag,
&api.prefix, api.metric, api.tag, api.nexthop_num, api.nexthop_num, nhg_id);
nhg_id);
bgp_debug_zebra_nh(&api); bgp_debug_zebra_nh(&api);
zlog_debug("%s: %pFX: announcing to zebra (recursion %sset)", zlog_debug("%s: %pFX: announcing to zebra (recursion %sset)",
__func__, p, (allow_recursion ? "" : "NOT ")); __func__, p, (allow_recursion ? "" : "NOT "));
} }
return zclient_route_send(is_add ? ZEBRA_ROUTE_ADD : ZEBRA_ROUTE_DELETE,
zclient, &api); return zclient_route_send(ZEBRA_ROUTE_ADD, zclient, &api);
} }