zebra/vxlan: Filter zapi messages with EVPN VRF

Since the EVPN VRF may not be the default one, compare received
messages' VRF agains the EVPN VRF and not the Default.

Signed-off-by: Tuetuopay <tuetuopay@me.com>
Sponsored-by: Scaleway

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index bf124224669efd5048f64b0058d9ceaf161ac61e..33e4655a1d2e041cee47dbb72acaf81b2388d861 100644 (file)
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -338,7 +338,7 @@ static int advertise_svi_macip_enabled(zebra_vni_t *zvni)
 {
        struct zebra_vrf *zvrf;
 
-       zvrf = vrf_info_lookup(VRF_DEFAULT);
+       zvrf = zebra_vrf_get_evpn();
        if (zvrf && zvrf->advertise_svi_macip)
                return 1;
 
@@ -7761,9 +7761,9 @@ void zebra_vxlan_remote_vtep_del(ZAPI_HANDLER_ARGS)
                return;
        }
 
-       if (zvrf_id(zvrf) != VRF_DEFAULT) {
-               zlog_debug("Recv MACIP DEL for non-default VRF %u",
-                          zvrf_id(zvrf));
+       if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) {
+               zlog_debug("Recv MACIP DEL for non-EVPN VRF %u",
+                         zvrf_id(zvrf));
                return;
        }
 
@@ -7845,9 +7845,9 @@ void zebra_vxlan_remote_vtep_add(ZAPI_HANDLER_ARGS)
                return;
        }
 
-       if (zvrf_id(zvrf) != VRF_DEFAULT) {
-               zlog_debug("Recv MACIP ADD for non-default VRF %u",
-                          zvrf_id(zvrf));
+       if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) {
+               zlog_debug("Recv MACIP ADD for non-EVPN VRF %u",
+                         zvrf_id(zvrf));
                return;
        }
 
@@ -8733,8 +8733,8 @@ void zebra_vxlan_flood_control(ZAPI_HANDLER_ARGS)
        struct stream *s;
        enum vxlan_flood_control flood_ctrl;
 
-       if (zvrf_id(zvrf) != VRF_DEFAULT) {
-               zlog_err("EVPN flood control for non-default VRF %u",
+       if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) {
+               zlog_err("EVPN flood control for non-EVPN VRF %u",
                         zvrf_id(zvrf));
                return;
        }
@@ -8773,9 +8773,9 @@ void zebra_vxlan_advertise_svi_macip(ZAPI_HANDLER_ARGS)
        zebra_vni_t *zvni = NULL;
        struct interface *ifp = NULL;
 
-       if (zvrf_id(zvrf) != VRF_DEFAULT) {
-               zlog_debug("EVPN GW-MACIP Adv for non-default VRF %u",
-                          zvrf_id(zvrf));
+       if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) {
+               zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u",
+                         zvrf_id(zvrf));
                return;
        }
 
@@ -8872,9 +8872,9 @@ void zebra_vxlan_advertise_subnet(ZAPI_HANDLER_ARGS)
        struct zebra_l2info_vxlan zl2_info;
        struct interface *vlan_if = NULL;
 
-       if (zvrf_id(zvrf) != VRF_DEFAULT) {
-               zlog_debug("EVPN GW-MACIP Adv for non-default VRF %u",
-                          zvrf_id(zvrf));
+       if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) {
+               zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u",
+                         zvrf_id(zvrf));
                return;
        }
 
@@ -8935,8 +8935,8 @@ void zebra_vxlan_advertise_gw_macip(ZAPI_HANDLER_ARGS)
        zebra_vni_t *zvni = NULL;
        struct interface *ifp = NULL;
 
-       if (zvrf_id(zvrf) != VRF_DEFAULT) {
-               zlog_debug("EVPN GW-MACIP Adv for non-default VRF %u",
+       if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) {
+               zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u",
                           zvrf_id(zvrf));
                return;
        }