From 7b3eaa999d0ed6ca0b40074ed2cf7e401f61eb4c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 25 Apr 2016 20:01:04 -0400 Subject: [PATCH] zebra: Fix PTM to not pass a default vrf name The default vrf name choosen in quagga has no meaning. Don't pass it to the ptm process as it gets dizzy. Ticket: CM-10581 Signed-off-by: Donald Sharp Reviewed-by: Kanna Rajagopal --- zebra/zebra_ptm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index 949514f27b..731bd3562b 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -757,8 +757,9 @@ zebra_ptm_bfd_dst_register (struct zserv *client, int sock, u_short length, ptm_lib_append_msg(ptm_hdl, out_ctxt, ZEBRA_PTM_BFD_MAX_HOP_CNT_FIELD, tmp_buf); - ptm_lib_append_msg(ptm_hdl, out_ctxt, ZEBRA_PTM_BFD_VRF_NAME_FIELD, - zvrf->name); + if (zvrf->vrf_id != VRF_DEFAULT) + ptm_lib_append_msg(ptm_hdl, out_ctxt, ZEBRA_PTM_BFD_VRF_NAME_FIELD, + zvrf->name); } else { @@ -903,8 +904,9 @@ zebra_ptm_bfd_dst_deregister (struct zserv *client, int sock, u_short length, ZEBRA_PTM_BFD_SRC_IP_FIELD, buf); } #endif /* HAVE_IPV6 */ - ptm_lib_append_msg(ptm_hdl, out_ctxt, ZEBRA_PTM_BFD_VRF_NAME_FIELD, - zvrf->name); + if (zvrf->vrf_id != VRF_DEFAULT) + ptm_lib_append_msg(ptm_hdl, out_ctxt, ZEBRA_PTM_BFD_VRF_NAME_FIELD, + zvrf->name); } else { -- 2.39.5