proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-10 21:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: Fix P2MP handling when TI-LFA is enabled

Browse Source 
Signed-off-by: GalaxyGorilla <sascha@netdef.org>
This commit is contained in:
GalaxyGorilla 2020-12-16 15:02:29 +00:00
parent f026b24ed9
commit 94dd5670d0
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ospfd/ospf_spf.c
View File

@ -847,18 +847,23 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
struct ospf_interface *oi = NULL; struct ospf_interface *oi = NULL;
struct in_addr nexthop = {.s_addr = 0}; struct in_addr nexthop = {.s_addr = 0};
oi = ospf_if_lookup_by_lsa_pos(area, lsa_pos); if (area->spf_root_node) {
oi = ospf_if_lookup_by_lsa_pos(area,
lsa_pos);
if (!oi) { if (!oi) {
zlog_debug( zlog_debug(
"%s: OI not found in LSA: lsa_pos: %d link_id:%s link_data:%s", "%s: OI not found in LSA: lsa_pos: %d link_id:%s link_data:%s",
__func__, lsa_pos, __func__, lsa_pos,
inet_ntop(AF_INET, &l->link_id, inet_ntop(AF_INET,
&l->link_id,
buf1, BUFSIZ), buf1, BUFSIZ),
inet_ntop(AF_INET, inet_ntop(AF_INET,
&l->link_data, buf2, &l->link_data,
buf2,
BUFSIZ)); BUFSIZ));
return 0; return 0;
} }
}
/* /*
* If the destination is a router which connects * If the destination is a router which connects
@ -905,7 +910,21 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
* as described above using a reverse lookup to * as described above using a reverse lookup to
* figure out the nexthop. * figure out the nexthop.
*/ */
if (oi->type == OSPF_IFTYPE_POINTOPOINT) {
/*
* HACK: we don't know (yet) how to distinguish
* between P2P and P2MP interfaces by just
* looking at LSAs, which is important for
* TI-LFA since you want to do SPF calculations
* from the perspective of other nodes. Since
* TI-LFA is currently not implemented for P2MP
* we just check here if it is enabled and then
* blindly assume that P2P is used. Ultimately
* the interface code needs to be removed
* somehow.
*/
if (area->ospf->ti_lfa_enabled
|| (oi && oi->type == OSPF_IFTYPE_POINTOPOINT)) {
struct ospf_neighbor *nbr_w = NULL; struct ospf_neighbor *nbr_w = NULL;
/* Calculating node is root node, link /* Calculating node is root node, link
@ -934,7 +953,7 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
} }
} }
} }
} else if (oi->type } else if (oi && oi->type
== OSPF_IFTYPE_POINTOMULTIPOINT) { == OSPF_IFTYPE_POINTOMULTIPOINT) {
struct prefix_ipv4 la; struct prefix_ipv4 la;
@ -979,7 +998,7 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
} else } else
zlog_info( zlog_info(
"%s: could not determine nexthop for link %s", "%s: could not determine nexthop for link %s",
__func__, oi->ifp->name); __func__, oi ? oi->ifp->name : "");
} /* end point-to-point link from V to W */ } /* end point-to-point link from V to W */
else if (l->m[0].type == LSA_LINK_TYPE_VIRTUALLINK) { else if (l->m[0].type == LSA_LINK_TYPE_VIRTUALLINK) {
/* /*

1
tests/ospfd/test_ospf_spf.c
View File

@ -43,6 +43,7 @@ static struct ospf *test_init(struct ospf_test_node *root)
inet_aton(root->router_id, &router_id); inet_aton(root->router_id, &router_id);
ospf->router_id = router_id; ospf->router_id = router_id;
ospf->router_id_static = router_id; ospf->router_id_static = router_id;
ospf->ti_lfa_enabled = true;
return ospf; return ospf;
} }