From cff8f33b613757461e43d7aad938446647982f96 Mon Sep 17 00:00:00 2001 From: Tuetuopay Date: Fri, 22 Mar 2019 11:08:01 +0100 Subject: [PATCH] zebra: Lookup dad and replication settings from EVPN VRF Signed-off-by: Tuetuopay Sponsored-by: Scaleway --- zebra/zebra_vxlan.c | 7 ++++--- zebra/zebra_vxlan.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 9b7eadf728..88a4375238 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -704,11 +704,10 @@ static void zvni_print_neigh(zebra_neigh_t *n, void *ctxt, json_object *json) struct zebra_vrf *zvrf = NULL; struct timeval detect_start_time = {0, 0}; - zvrf = zebra_vrf_lookup_by_id(VRF_DEFAULT); + zvrf = zebra_vrf_get_evpn(); if (!zvrf) return; - zvrf = zebra_vrf_lookup_by_id(VRF_DEFAULT); ipaddr2str(&n->ip, buf2, sizeof(buf2)); prefix_mac2str(&n->emac, buf1, sizeof(buf1)); type_str = CHECK_FLAG(n->flags, ZEBRA_NEIGH_LOCAL) ? @@ -1152,7 +1151,9 @@ static void zvni_print_mac(zebra_mac_t *mac, void *ctxt, json_object *json) struct zebra_vrf *zvrf; struct timeval detect_start_time = {0, 0}; - zvrf = zebra_vrf_lookup_by_id(VRF_DEFAULT); + zvrf = zebra_vrf_get_evpn(); + if (!zvrf) + return; vty = (struct vty *)ctxt; prefix_mac2str(&mac->macaddr, buf1, sizeof(buf1)); diff --git a/zebra/zebra_vxlan.h b/zebra/zebra_vxlan.h index 38fef4b988..6ca33ae159 100644 --- a/zebra/zebra_vxlan.h +++ b/zebra/zebra_vxlan.h @@ -47,7 +47,7 @@ static inline int is_evpn_enabled(void) static inline int is_vxlan_flooding_head_end(void) { - struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(VRF_DEFAULT); + struct zebra_vrf *zvrf = zebra_vrf_get_evpn(); if (!zvrf) return 0; -- 2.39.5