proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 09:52:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12151 from louis-6wind/fix-mpls-te

Browse Source 
isisd: fixes for mpls-te
This commit is contained in:
Olivier Dugeon 2022-10-25 13:51:24 +02:00 committed by GitHub
commit c3a02dde41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 86 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
isisd/isis_te.c
View File

@ -66,6 +66,8 @@
DEFINE_MTYPE_STATIC(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters"); DEFINE_MTYPE_STATIC(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters");
static void isis_mpls_te_circuit_ip_update(struct isis_circuit *circuit);
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* Following are control functions for MPLS-TE parameters management. * Following are control functions for MPLS-TE parameters management.
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
@ -111,9 +113,13 @@ void isis_mpls_te_create(struct isis_area *area)
if (area->mta->ted) if (area->mta->ted)
isis_te_init_ted(area); isis_te_init_ted(area);
/* Update Extended TLVs according to Interface link parameters */ /* Update Extended TLVs according to Interface link parameters
for (ALL_LIST_ELEMENTS_RO(area->circuit_list, node, circuit)) * and neighbor IP addresses
*/
for (ALL_LIST_ELEMENTS_RO(area->circuit_list, node, circuit)) {
isis_link_params_update(circuit, circuit->interface); isis_link_params_update(circuit, circuit->interface);
isis_mpls_te_circuit_ip_update(circuit);
}
} }
/** /**
@ -132,7 +138,7 @@ void isis_mpls_te_disable(struct isis_area *area)
area->mta->status = disable; area->mta->status = disable;
/* Remove Link State Database */ /* Remove Link State Database */
ls_ted_del_all(&area->mta->ted); ls_ted_clean(area->mta->ted);
/* Disable Extended SubTLVs on all circuit */ /* Disable Extended SubTLVs on all circuit */
for (ALL_LIST_ELEMENTS_RO(area->circuit_list, node, circuit)) { for (ALL_LIST_ELEMENTS_RO(area->circuit_list, node, circuit)) {
@ -336,16 +342,12 @@ void isis_link_params_update(struct isis_circuit *circuit,
return; return;
} }
static int isis_mpls_te_adj_ip_enabled(struct isis_adjacency *adj, int family, static int _isis_mpls_te_adj_ip_enabled(struct isis_adjacency *adj, int family,
bool global) bool global)
{ {
struct isis_circuit *circuit; struct isis_circuit *circuit;
struct isis_ext_subtlvs *ext; struct isis_ext_subtlvs *ext;
/* Sanity Check */
if (!adj || !adj->circuit)
return 0;
circuit = adj->circuit; circuit = adj->circuit;
/* Check that MPLS TE is enabled */ /* Check that MPLS TE is enabled */
@ -366,6 +368,12 @@ static int isis_mpls_te_adj_ip_enabled(struct isis_adjacency *adj, int family,
} }
break; break;
case AF_INET6: case AF_INET6:
/* Nothing to do for link-local addresses - ie. not global.
* https://datatracker.ietf.org/doc/html/rfc6119#section-3.1.1
* Because the IPv6 traffic engineering TLVs present in LSPs are
* propagated across networks, they MUST NOT use link-local
* addresses.
*/
if (!global) if (!global)
return 0; return 0;
@ -381,22 +389,32 @@ static int isis_mpls_te_adj_ip_enabled(struct isis_adjacency *adj, int family,
return 0; return 0;
} }
/* Update LSP */
lsp_regenerate_schedule(circuit->area, circuit->is_type, 0);
return 0; return 0;
} }
static int isis_mpls_te_adj_ip_disabled(struct isis_adjacency *adj, int family, static int isis_mpls_te_adj_ip_enabled(struct isis_adjacency *adj, int family,
bool global)
{
int ret;
/* Sanity Check */
if (!adj || !adj->circuit)
return 0;
ret = _isis_mpls_te_adj_ip_enabled(adj, family, global);
/* Update LSP */
lsp_regenerate_schedule(adj->circuit->area, adj->circuit->is_type, 0);
return ret;
}
static int _isis_mpls_te_adj_ip_disabled(struct isis_adjacency *adj, int family,
bool global) bool global)
{ {
struct isis_circuit *circuit; struct isis_circuit *circuit;
struct isis_ext_subtlvs *ext; struct isis_ext_subtlvs *ext;
/* Sanity Check */
if (!adj || !adj->circuit || !adj->circuit->ext)
return 0;
circuit = adj->circuit; circuit = adj->circuit;
/* Check that MPLS TE is enabled */ /* Check that MPLS TE is enabled */
@ -422,12 +440,59 @@ static int isis_mpls_te_adj_ip_disabled(struct isis_adjacency *adj, int family,
return 0; return 0;
} }
/* Update LSP */
lsp_regenerate_schedule(circuit->area, circuit->is_type, 0);
return 0; return 0;
} }
static int isis_mpls_te_adj_ip_disabled(struct isis_adjacency *adj, int family,
bool global)
{
int ret;
/* Sanity Check */
if (!adj || !adj->circuit || !adj->circuit->ext)
return 0;
ret = _isis_mpls_te_adj_ip_disabled(adj, family, global);
/* Update LSP */
lsp_regenerate_schedule(adj->circuit->area, adj->circuit->is_type, 0);
return ret;
}
static void isis_mpls_te_circuit_ip_update(struct isis_circuit *circuit)
{
struct isis_adjacency *adj;
/* https://datatracker.ietf.org/doc/html/rfc6119#section-3.2.3
* This sub-TLV of the Extended IS Reachability TLV is used for point-
* to-point links
*/
if (circuit->circ_type != CIRCUIT_T_P2P)
return;
adj = circuit->u.p2p.neighbor;
if (!adj)
return;
/* Nothing to do for link-local addresses.
* https://datatracker.ietf.org/doc/html/rfc6119#section-3.1.1
* Because the IPv6 traffic engineering TLVs present in LSPs are
* propagated across networks, they MUST NOT use link-local addresses.
*/
if (adj->ipv4_address_count > 0)
_isis_mpls_te_adj_ip_enabled(adj, AF_INET, false);
else
_isis_mpls_te_adj_ip_disabled(adj, AF_INET, false);
if (adj->global_ipv6_count > 0)
_isis_mpls_te_adj_ip_enabled(adj, AF_INET6, true);
else
_isis_mpls_te_adj_ip_disabled(adj, AF_INET6, true);
}
int isis_mpls_te_update(struct interface *ifp) int isis_mpls_te_update(struct interface *ifp)
{ {
struct isis_circuit *circuit; struct isis_circuit *circuit;