proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 15:07:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: fix mpls nexthop announce to zebra

Browse Source 
currently, has_valid_label is only used to check need to print debug,
but if route has normal nexthops and mpls nexthops, label information
will be printed even for normal nexthops.

Signed-off-by: Ryoga Saito <ryoga.saito@linecorp.com>
This commit is contained in:
Ryoga Saito 2021-09-22 04:58:59 +00:00
parent 3c11665b02
commit cd18af00c8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_zebra.c
View File

@ -1219,7 +1219,6 @@ void bgp_zebra_announce(struct bgp_dest *dest, const struct prefix *p,
struct zapi_nexthop *api_nh; struct zapi_nexthop *api_nh;
int nh_family; int nh_family;
unsigned int valid_nh_count = 0; unsigned int valid_nh_count = 0;
int has_valid_label = 0;
bool allow_recursion = false; bool allow_recursion = false;
int has_valid_sid = 0; int has_valid_sid = 0;
uint8_t distance; uint8_t distance;
@ -1434,7 +1433,6 @@ void bgp_zebra_announce(struct bgp_dest *dest, const struct prefix *p,
if (mpinfo->extra if (mpinfo->extra
&& bgp_is_valid_label(&mpinfo->extra->label[0]) && bgp_is_valid_label(&mpinfo->extra->label[0])
&& !CHECK_FLAG(api.flags, ZEBRA_FLAG_EVPN_ROUTE)) { && !CHECK_FLAG(api.flags, ZEBRA_FLAG_EVPN_ROUTE)) {
has_valid_label = 1;
label = label_pton(&mpinfo->extra->label[0]); label = label_pton(&mpinfo->extra->label[0]);
SET_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_LABEL); SET_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_LABEL);
@ -1560,7 +1558,7 @@ void bgp_zebra_announce(struct bgp_dest *dest, const struct prefix *p,
label_buf[0] = '\0'; label_buf[0] = '\0';
eth_buf[0] = '\0'; eth_buf[0] = '\0';
segs_buf[0] = '\0'; segs_buf[0] = '\0';
if (has_valid_label if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_LABEL)
&& !CHECK_FLAG(api.flags, ZEBRA_FLAG_EVPN_ROUTE)) && !CHECK_FLAG(api.flags, ZEBRA_FLAG_EVPN_ROUTE))
snprintf(label_buf, sizeof(label_buf), snprintf(label_buf, sizeof(label_buf),
"label %u", api_nh->labels[0]); "label %u", api_nh->labels[0]);