Merge pull request #12780 from opensourcerouting/spdx-license-id

[mirror_frr.git] / zebra / zebra_nb_state.c

diff --git a/zebra/zebra_nb_state.c b/zebra/zebra_nb_state.c
index 80af99fba7ce57dacb3868d3556de736132d8d1a..acf0b80aca685d72ed8aeb0e6d3fa79911e786b1 100644 (file)
--- a/zebra/zebra_nb_state.c
+++ b/zebra/zebra_nb_state.c
@@ -12,6 +12,8 @@
 #include "zebra/zebra_router.h"
 #include "zebra/debug.h"
 #include "printfrr.h"
+#include "zebra/zebra_vxlan.h"
+#include "zebra/zebra_vxlan_if.h"
 
 /*
  * XPath: /frr-interface:lib/interface/frr-zebra:zebra/state/up-count
@@ -88,15 +90,18 @@ lib_interface_zebra_state_vni_id_get_elem(struct nb_cb_get_elem_args *args)
 {
        const struct interface *ifp = args->list_entry;
        struct zebra_if *zebra_if;
-       struct zebra_l2info_vxlan *vxlan_info;
+       struct zebra_vxlan_vni *vni;
 
        if (!IS_ZEBRA_IF_VXLAN(ifp))
                return NULL;
 
        zebra_if = ifp->info;
-       vxlan_info = &zebra_if->l2info.vxl;
 
-       return yang_data_new_uint32(args->xpath, vxlan_info->vni);
+       if (!IS_ZEBRA_VXLAN_IF_VNI(zebra_if))
+               return NULL;
+
+       vni = zebra_vxlan_if_vni_find(zebra_if, 0);
+       return yang_data_new_uint32(args->xpath, vni->vni);
 }
 
 /*
@@ -126,15 +131,18 @@ lib_interface_zebra_state_mcast_group_get_elem(struct nb_cb_get_elem_args *args)
 {
        const struct interface *ifp = args->list_entry;
        struct zebra_if *zebra_if;
-       struct zebra_l2info_vxlan *vxlan_info;
+       struct zebra_vxlan_vni *vni;
 
        if (!IS_ZEBRA_IF_VXLAN(ifp))
                return NULL;
 
        zebra_if = ifp->info;
-       vxlan_info = &zebra_if->l2info.vxl;
 
-       return yang_data_new_ipv4(args->xpath, &vxlan_info->mcast_grp);
+       if (!IS_ZEBRA_VXLAN_IF_VNI(zebra_if))
+               return NULL;
+
+       vni = zebra_vxlan_if_vni_find(zebra_if, 0);
+       return yang_data_new_ipv4(args->xpath, &vni->mcast_grp);
 }
 
 const void *lib_vrf_zebra_ribs_rib_get_next(struct nb_cb_get_next_args *args)