From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 26 Apr 2016 00:01:04 +0000 (-0400)
Subject: zebra: Fix PTM to not pass a default vrf name
X-Git-Tag: frr-2.0-rc1~952^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7b3eaa999d0ed6ca0b40074ed2cf7e401f61eb4c;p=matthieu%2Ffrr.git

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 <sharpd@cumulusnetworks.com>
Reviewed-by: Kanna Rajagopal <kanna@cumulusnetworks.com>
---

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
     {