From: Don Slice <dslice@cumulusnetworks.com>
Date: Tue, 16 May 2017 13:48:18 +0000 (-0400)
Subject: bgpd: resolve issue with sending vpn labels
X-Git-Tag: reindent-master-before~147^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=604bbacbcf9e3dbee2c72d2454d20c54a3f9803f;p=matthieu%2Ffrr.git

bgpd: resolve issue with sending vpn labels

Found issue where sending labels using "address-family ipv4 vpn" was
broken by the labeled-unicast changes.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index f734763b70..87a9cfdcfa 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -763,7 +763,13 @@ subgroup_update_packet (struct update_subgroup *subgrp)
 
 	  if (rn->prn)
 	    prd = (struct prefix_rd *) &rn->prn->p;
-          tag = bgp_adv_label(rn, binfo, peer, afi, safi);
+
+          if (safi == SAFI_LABELED_UNICAST)
+            tag = bgp_adv_label(rn, binfo, peer, afi, safi);
+          else
+            if (binfo && binfo->extra)
+              tag = binfo->extra->tag;
+
           if (bgp_labeled_safi(safi))
             sprintf (label_buf, "label %u", label_pton(tag));