]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: Fix PTM to not pass a default vrf name
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 26 Apr 2016 00:01:04 +0000 (20:01 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 27 Apr 2016 19:55:23 +0000 (15:55 -0400)
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>
zebra/zebra_ptm.c

index 949514f27bc98bd9dbaa3e07da13967d93892d30..731bd3562b57c4c22029a11c692319e9724d5b1a 100644 (file)
@@ -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
     {