summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2021-06-23 08:01:11 -0400
committerGitHub <noreply@github.com>2021-06-23 08:01:11 -0400
commitc5a0f3ba39c04064960d43df54d135c80288bcf6 (patch)
treeea6185a840e51aca9f8497873e926777fa708a28
parent97935a2e7c75b5174ea7c02c9167493749a56138 (diff)
parent9e4948b47eac24eff366daacbdcbb067c0308120 (diff)
Merge pull request #8906 from ton31337/fix/bgp_default_originate_withdraw_7.3stable/7.3
bgpd: [7.3] withdraw default route when route-map has no match
-rw-r--r--bgpd/bgp_updgrp_adv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index 26dda8ebda..9025ae15c1 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -760,6 +760,9 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
*/
for (rn = bgp_table_top(bgp->rib[afi][safi]); rn;
rn = bgp_route_next(rn)) {
+ if (!bgp_node_has_bgp_path_info_data(rn))
+ continue;
+
ret = route_map_apply(peer->default_rmap[afi][safi].map,
&rn->p, RMAP_BGP, &bpi_rmap);