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

isisd: fix renaming backup define for ENDX SID

Browse Source 
The define has inheritated from a wrong naming in sr-mpls.
Fix this by renaming ISIS_SRV6_LAN_BACKUP to ISIS_SRV6_ADJ_BACKUP.

Fixes: 2566656a6f ("isisd: Add data structure for SRv6 Adjacency SIDs")

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2024-04-19 15:46:20 +02:00
parent 7ba58e97ff
commit ad874c7d3b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
isisd/isis_srv6.c
View File

@ -363,7 +363,7 @@ void isis_area_delete_backup_srv6_endx_sids(struct isis_area *area, int level)
struct listnode *node, *nnode; struct listnode *node, *nnode;
for (ALL_LIST_ELEMENTS(area->srv6db.srv6_endx_sids, node, nnode, sra)) for (ALL_LIST_ELEMENTS(area->srv6db.srv6_endx_sids, node, nnode, sra))
if (sra->type == ISIS_SRV6_LAN_BACKUP && if (sra->type == ISIS_SRV6_ADJ_BACKUP &&
(sra->adj->level & level)) (sra->adj->level & level))
srv6_endx_sid_del(sra); srv6_endx_sid_del(sra);
} }
@ -420,7 +420,7 @@ void srv6_endx_sid_add_single(struct isis_adjacency *adj, bool backup,
: SRV6_ENDPOINT_BEHAVIOR_END_X; : SRV6_ENDPOINT_BEHAVIOR_END_X;
sra = XCALLOC(MTYPE_ISIS_SRV6_INFO, sizeof(*sra)); sra = XCALLOC(MTYPE_ISIS_SRV6_INFO, sizeof(*sra));
sra->type = backup ? ISIS_SRV6_LAN_BACKUP : ISIS_SRV6_ADJ_NORMAL; sra->type = backup ? ISIS_SRV6_ADJ_BACKUP : ISIS_SRV6_ADJ_NORMAL;
sra->behavior = behavior; sra->behavior = behavior;
sra->locator = chunk; sra->locator = chunk;
sra->structure.loc_block_len = chunk->block_bits_length; sra->structure.loc_block_len = chunk->block_bits_length;
@ -538,7 +538,7 @@ void srv6_endx_sid_del(struct srv6_adjacency *sra)
exit(1); exit(1);
} }
if (sra->type == ISIS_SRV6_LAN_BACKUP && sra->backup_nexthops) { if (sra->type == ISIS_SRV6_ADJ_BACKUP && sra->backup_nexthops) {
sra->backup_nexthops->del = sra->backup_nexthops->del =
(void (*)(void *))isis_nexthop_delete; (void (*)(void *))isis_nexthop_delete;
list_delete(&sra->backup_nexthops); list_delete(&sra->backup_nexthops);

2
isisd/isis_srv6.h
View File

@ -68,7 +68,7 @@ struct isis_srv6_locator {
/* SRv6 Adjacency-SID type */ /* SRv6 Adjacency-SID type */
enum srv6_adj_type { enum srv6_adj_type {
ISIS_SRV6_ADJ_NORMAL = 0, ISIS_SRV6_ADJ_NORMAL = 0,
ISIS_SRV6_LAN_BACKUP, ISIS_SRV6_ADJ_BACKUP,
}; };
/* SRv6 Adjacency. */ /* SRv6 Adjacency. */