Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-05-18 11:31:05 +02:00
commit 31d08cde94

View File

@ -762,7 +762,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));