From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Fri, 8 Dec 2017 13:00:36 +0000 (+0100)
Subject: BGP: Fix IPv6 MPLS/VPN multicast SAFI
X-Git-Tag: v2.0.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c7ef3b21e51ae7d1969baa52b4d8fd29b22eeb;p=thirdparty%2Fbird.git

BGP: Fix IPv6 MPLS/VPN multicast SAFI
---

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 038e89f9b..aa69bdd68 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);