proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-03 13:01:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: Fix backup path RIB handling

Browse Source 
* Inject backup paths with proper flags
  * Add outgoing label on top of the backup label stack
  * Ignore explicit/implicit outgoing labels
  * Adjust tests

Signed-off-by: GalaxyGorilla <sascha@netdef.org>
This commit is contained in:
GalaxyGorilla 2020-12-15 11:20:28 +00:00
parent 7815c834c7
commit f026b24ed9
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ospfd/ospf_zebra.c
View File

@ -210,7 +210,7 @@ static void ospf_zebra_add_nexthop(struct ospf *ospf, struct ospf_path *path,
api_nh_backup = &api->backup_nexthops[api->backup_nexthop_num];
api_nh_backup->vrf_id = ospf->vrf_id;
api_nh_backup->type = NEXTHOP_TYPE_IPV4_IFINDEX;
api_nh_backup->type = NEXTHOP_TYPE_IPV4;
api_nh_backup->gate.ipv4 = path->srni.backup_nexthop;
api_nh_backup->label_num =
@ -579,22 +579,33 @@ void ospf_zebra_update_prefix_sid(const struct sr_prefix *srp)
if (zl.nexthop_num >= MULTIPATH_NUM)
break;
/* TI-LFA backup path label stack comes first, if
* present */
/*
* TI-LFA backup path label stack comes first, if
* present.
*/
if (path->srni.backup_label_stack) {
znh_backup = &zl.backup_nexthops
[zl.backup_nexthop_num++];
znh_backup->type = NEXTHOP_TYPE_IPV4_IFINDEX;
znh_backup->type = NEXTHOP_TYPE_IPV4;
znh_backup->gate.ipv4 =
path->srni.backup_nexthop;
memcpy(znh_backup->labels,
path->srni.backup_label_stack->label,
sizeof(mpls_label_t)
* path->srni.backup_label_stack
->num_labels);
znh_backup->label_num =
path->srni.backup_label_stack
->num_labels;
memcpy(znh_backup->labels,
path->srni.backup_label_stack->label,
sizeof(mpls_label_t)
* znh_backup->label_num);
if (path->srni.label_out
!= MPLS_LABEL_IPV4_EXPLICIT_NULL
&& path->srni.label_out
!= MPLS_LABEL_IMPLICIT_NULL)
znh_backup->labels
[znh_backup->label_num++] =
path->srni.label_out;
}
znh = &zl.nexthops[zl.nexthop_num++];

6
tests/topotests/ospf-tilfa-topo1/rt1/step2/show_ip_route_link_protection.ref
View File

@ -78,7 +78,8 @@
{
"ip":"10.0.2.2",
"labels":[
16050
16050,
16040
]
}
]
@ -101,7 +102,8 @@
{
"ip":"10.0.1.2",
"labels":[
16040
16040,
16050
]
}
]