matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #15236 from louis-6wind/fix-label-cmp

Browse source 
bgpd: fix mpls label pointer comparison
This commit is contained in:
Donald Sharp 2024-01-28 09:20:56 -05:00 committed by GitHub
parent 4cb03cacd9 db1bb52c4b
commit 4d92badcde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bgpd/bgp_route.c
View file

@ -4520,12 +4520,12 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
hook_call(bgp_process, bgp, afi, safi, dest, peer, true); hook_call(bgp_process, bgp, afi, safi, dest, peer, true);
/* Same attribute comes in. */ /* Same attribute comes in. */
if (!CHECK_FLAG(pi->flags, BGP_PATH_REMOVED) if (!CHECK_FLAG(pi->flags, BGP_PATH_REMOVED) && same_attr &&
&& same_attr (!has_valid_label ||
&& (!has_valid_label (bgp_path_info_extra_get(pi) &&
|| memcmp(&(bgp_path_info_extra_get(pi))->label, label, bgp_labels_same((const mpls_label_t *)pi->extra->label,
num_labels * sizeof(mpls_label_t)) pi->extra->num_labels, label,
== 0)) { num_labels)))) {
if (CHECK_FLAG(bgp->af_flags[afi][safi], if (CHECK_FLAG(bgp->af_flags[afi][safi],
BGP_CONFIG_DAMPENING) BGP_CONFIG_DAMPENING)
&& peer->sort == BGP_PEER_EBGP && peer->sort == BGP_PEER_EBGP
@ -4710,7 +4710,9 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
/* Update MPLS label */ /* Update MPLS label */
if (has_valid_label) { if (has_valid_label) {
extra = bgp_path_info_extra_get(pi); extra = bgp_path_info_extra_get(pi);
if (extra->label != label) { if (!bgp_labels_same((const mpls_label_t *)extra->label,
extra->num_labels, label,
num_labels)) {
memcpy(&extra->label, label, memcpy(&extra->label, label,
num_labels * sizeof(mpls_label_t)); num_labels * sizeof(mpls_label_t));
extra->num_labels = num_labels; extra->num_labels = num_labels;
@ -4909,7 +4911,8 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
/* Update MPLS label */ /* Update MPLS label */
if (has_valid_label) { if (has_valid_label) {
extra = bgp_path_info_extra_get(new); extra = bgp_path_info_extra_get(new);
if (extra->label != label) { if (!bgp_labels_same((const mpls_label_t *)extra->label,
extra->num_labels, label, num_labels)) {
memcpy(&extra->label, label, memcpy(&extra->label, label,
num_labels * sizeof(mpls_label_t)); num_labels * sizeof(mpls_label_t));
extra->num_labels = num_labels; extra->num_labels = num_labels;