From 49c7ef3b21e51ae7d1969baa52b4d8fd29b22eeb Mon Sep 17 00:00:00 2001
From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
Date: Fri, 8 Dec 2017 14:00:36 +0100
Subject: [PATCH] BGP: Fix IPv6 MPLS/VPN multicast SAFI

---
 proto/bgp/packets.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 038e89f9..aa69bdd6 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1483,7 +1483,8 @@ bgp_encode_nlri_vpn6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *b
     ADVANCE(pos, size, 1);
 
     /* Encode MPLS labels */
-    bgp_encode_mpls_labels(s, s->mpls_labels, &pos, &size, pos - 1);
+    if (s->mpls)
+      bgp_encode_mpls_labels(s, s->mpls_labels, &pos, &size, pos - 1);
 
     /* Encode route distinguisher */
     put_u64(pos, net->rd);