bgpd: fix route-map update and delete route-map

Description:
- When there is change in route-map properties after
  setting the route-map with default route, changes
  will not reflect.
- When route-map associated with default-originate is
  deleted, default route doesn't get withdrawn.

- When there is change in route-map default-originate flow
  does not get triggered.

Fix:
- One of the flags needs to be unset for default-originate
  flow to get triggered after change in route-map.
  Have unset the flag, so that default originate flow can
  be triggered.

Co-authored-by: Abhinay Ramesh <rabhinay@vmware.com>
Signed-off-by: Iqra Siddiqui <imujeebsiddi@vmware.com>

1 files changed, 25 insertions, 1 deletions

diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index c2b6632643..af2f564de7 100644
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -1482,7 +1482,24 @@ static int updgrp_policy_update_walkcb(struct update_group *updgrp, void *arg)
 					"u%" PRIu64 ":s%" PRIu64" announcing default upon default routemap %s change",
 					updgrp->id, subgrp->id,
 					ctx->policy_name);
-			subgroup_default_originate(subgrp, 0);
+			if (route_map_lookup_by_name(ctx->policy_name)) {
+				/*
+				 * When there is change in routemap, this flow
+				 * is triggered. the routemap is still present
+				 * in lib, hence its a update flow. The flag
+				 * needs to be unset.
+				 */
+				UNSET_FLAG(subgrp->sflags,
+					   SUBGRP_STATUS_DEFAULT_ORIGINATE);
+				subgroup_default_originate(subgrp, 0);
+			} else {
+				/*
+				 * This is a explicit withdraw, since the
+				 * routemap is not present in routemap lib. need
+				 * to pass 1 for withdraw arg.
+				 */
+				subgroup_default_originate(subgrp, 1);
+			}
 		}
 		update_subgroup_set_needs_refresh(subgrp, 0);
 	}
@@ -1860,6 +1877,13 @@ update_group_default_originate_route_map_walkcb(struct update_group *updgrp,
 		safi = SUBGRP_SAFI(subgrp);
 
 		if (peer->default_rmap[afi][safi].name) {
+			/*
+			 * When there is change in routemap this flow will
+			 * be triggered. We need to unset the Flag to ensure
+			 * the update flow gets triggered.
+			 */
+			UNSET_FLAG(subgrp->sflags,
+				   SUBGRP_STATUS_DEFAULT_ORIGINATE);
 			subgroup_default_originate(subgrp, 0);
 		}
 	}