Merge pull request #8361 from rameshabhinay/change_1

bgpd: vrf route leaking related fixes

diff --combined bgpd/bgp_mplsvpn.c
index 62fed931f95950440428f4149ec1fef820b04bfa,6b028ef32ff69281966080c447996fc1ed0270eb..eb68d84c069780532cb011406a4fa10bea692560
--- 1/bgpd/bgp_mplsvpn.c
--- 2/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@@ -540,6 -540,17 +540,17 @@@ leak_update(struct bgp *bgp, /* destina
        if (bpi) {
                bool labelssame = labels_same(bpi, label, num_labels);
  
+               if (CHECK_FLAG(source_bpi->flags, BGP_PATH_REMOVED)
+                   && CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED)) {
+                       if (debug) {
+                               zlog_debug(
+                                       "%s: ->%s(s_flags: 0x%x b_flags: 0x%x): %pFX: Found route, being removed, not leaking",
+                                       __func__, bgp->name_pretty,
+                                       source_bpi->flags, bpi->flags, p);
+                       }
+                       return NULL;
+               }
+ 
                if (attrhash_cmp(bpi->attr, new_attr) && labelssame
                    && !CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED)) {
  
@@@ -613,6 -624,16 +624,16 @@@
                return bpi;
        }
  
+       if (CHECK_FLAG(source_bpi->flags, BGP_PATH_REMOVED)) {
+               if (debug) {
+                       zlog_debug(
+                               "%s: ->%s(s_flags: 0x%x): %pFX: New route, being removed, not leaking",
+                               __func__, bgp->name_pretty,
+                               source_bpi->flags, p);
+               }
+               return NULL;
+       }
+ 
        new = info_make(ZEBRA_ROUTE_BGP, BGP_ROUTE_IMPORTED, 0,
                bgp->peer_self, new_attr, bn);
  
@@@ -1027,6 -1048,8 +1048,8 @@@ void vpn_leak_from_vrf_withdraw_all(str
                                        if (debug)
                                                zlog_debug("%s: deleting it",
                                                           __func__);
+                                       /* withdraw from leak-to vrfs as well */
+                                       vpn_leak_to_vrf_withdraw(bgp_vpn, bpi);
                                        bgp_aggregate_decrement(
                                                bgp_vpn,
                                                bgp_dest_get_prefix(bn), bpi,
@@@ -1101,7 -1124,10 +1124,10 @@@ vpn_leak_to_vrf_update_onevrf(struct bg
        if (!ecom_intersect(
                    bgp_vrf->vpn_policy[afi].rtlist[BGP_VPN_POLICY_DIR_FROMVPN],
                    path_vpn->attr->ecommunity)) {
- 
+               if (debug)
+                       zlog_debug(
+                               "from vpn to vrf %s, skipping after no intersection of route targets",
+                               bgp_vrf->name_pretty);
                return;
        }
  
@@@ -1417,6 -1443,7 +1443,6 @@@ void vpn_leak_to_vrf_update_all(struct 
                                struct bgp *bgp_vpn, /* from */
                                afi_t afi)
  {
 -      struct prefix_rd prd;
        struct bgp_dest *pdest;
        safi_t safi = SAFI_MPLS_VPN;
  
@@@ -1427,10 -1454,16 +1453,10 @@@
         */
        for (pdest = bgp_table_top(bgp_vpn->rib[afi][safi]); pdest;
             pdest = bgp_route_next(pdest)) {
 -              const struct prefix *p = bgp_dest_get_prefix(pdest);
                struct bgp_table *table;
                struct bgp_dest *bn;
                struct bgp_path_info *bpi;
  
 -              memset(&prd, 0, sizeof(prd));
 -              prd.family = AF_UNSPEC;
 -              prd.prefixlen = 64;
 -              memcpy(prd.val, &p->u.val, 8);
 -
                /* This is the per-RD table of prefixes */
                table = bgp_dest_get_bgp_table_info(pdest);
  
@@@ -1532,7 -1565,8 +1558,8 @@@ void vpn_handle_router_id_update(struc
                                 bool is_config)
  {
        afi_t afi;
-       int debug;
+       int debug = (BGP_DEBUG(vpn, VPN_LEAK_TO_VRF)
+                    | BGP_DEBUG(vpn, VPN_LEAK_FROM_VRF));
        char *vname;
        const char *export_name;
        char buf[RD_ADDRSTRLEN];
@@@ -1541,14 -1575,23 +1568,23 @@@
        struct ecommunity *ecom;
        vpn_policy_direction_t idir, edir;
  
+       /*
+        * Router-id change that is not explicitly configured
+        * (a change from zebra, frr restart for example)
+        * should not replace a configured vpn RD/RT.
+        */
+       if (!is_config) {
+               if (debug)
+                       zlog_debug("%s: skipping non explicit router-id change",
+                                  __func__);
+               return;
+       }
+ 
        if (bgp->inst_type != BGP_INSTANCE_TYPE_DEFAULT
            && bgp->inst_type != BGP_INSTANCE_TYPE_VRF)
                return;
  
        export_name = bgp->name ? bgp->name : VRF_DEFAULT_NAME;
-       debug = (BGP_DEBUG(vpn, VPN_LEAK_TO_VRF) |
-                    BGP_DEBUG(vpn, VPN_LEAK_FROM_VRF));
- 
        idir = BGP_VPN_POLICY_DIR_FROMVPN;
        edir = BGP_VPN_POLICY_DIR_TOVPN;
  
@@@ -1574,26 -1617,12 +1610,12 @@@
                                if (!bgp_import)
                                        continue;
  
-                               ecommunity_del_val(bgp_import->vpn_policy[afi].
-                                                  rtlist[idir],
+                               ecommunity_del_val(
+                                       bgp_import->vpn_policy[afi]
+                                               .rtlist[idir],
                                        (struct ecommunity_val *)ecom->val);
- 
                        }
                } else {
-                       /*
-                        * Router-id changes that are not explicit config
-                        * changes should not replace configured RD/RT.
-                        */
-                       if (!is_config) {
-                               if (CHECK_FLAG(bgp->vpn_policy[afi].flags,
-                                              BGP_VPN_POLICY_TOVPN_RD_SET)) {
-                                       if (debug)
-                                               zlog_debug("%s: auto router-id change skipped",
-                                                          __func__);
-                                       goto postchange;
-                               }
-                       }
- 
                        /* New router-id derive auto RD and RT and export
                         * to VPN
                         */
@@@ -1624,10 -1653,8 +1646,8 @@@
                                else
                                        bgp_import->vpn_policy[afi].rtlist[idir]
                                                = ecommunity_dup(ecom);
- 
                        }
  
- postchange:
                        /* Update routes to VPN */
                        vpn_leak_postchange(BGP_VPN_POLICY_DIR_TOVPN,
                                            afi, bgp_get_default(),