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

isisd: fix mispelling with ISIS_SR_LAN_BACKUP

Browse source 
The ISIS_SR_LAN_BACKUP should be renamed to ISIS_SR_ADJ_BACKUP.

Fixes: 26f6acafc3 ("isisd: add support for segment routing")

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2024-04-03 15:58:05 +02:00
parent 3d66dd3e86
commit 2e1be61b08
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
isisd/isis_adjacency.c
View file

@ -687,7 +687,7 @@ void isis_adj_print_json(struct isis_adjacency *adj, struct json_object *json,
default: default:
continue; continue;
} }
backup = (sra->type == ISIS_SR_LAN_BACKUP) ? " (backup)" backup = (sra->type == ISIS_SR_ADJ_BACKUP) ? " (backup)"
: ""; : "";
json_object_string_add(adj_sid_json, "nexthop", json_object_string_add(adj_sid_json, "nexthop",
@ -862,7 +862,7 @@ void isis_adj_print_vty(struct isis_adjacency *adj, struct vty *vty,
default: default:
continue; continue;
} }
backup = (sra->type == ISIS_SR_LAN_BACKUP) ? " (backup)" backup = (sra->type == ISIS_SR_ADJ_BACKUP) ? " (backup)"
: ""; : "";
vty_out(vty, " %s %s%s: %u\n", vty_out(vty, " %s %s%s: %u\n",

5
isisd/isis_lfa.c
View file

@ -916,9 +916,8 @@ int isis_tilfa_check(struct isis_spftree *spftree_pc,
adj = isis_adj_find(spftree_pc->area, spftree_pc->level, adj = isis_adj_find(spftree_pc->area, spftree_pc->level,
vertex->N.id); vertex->N.id);
if (adj if (adj && isis_sr_adj_sid_find(adj, spftree_pc->family,
&& isis_sr_adj_sid_find(adj, spftree_pc->family, ISIS_SR_ADJ_BACKUP)) {
ISIS_SR_LAN_BACKUP)) {
if (IS_DEBUG_LFA) if (IS_DEBUG_LFA)
zlog_debug( zlog_debug(
"ISIS-LFA: %s %s already covered by node protection", "ISIS-LFA: %s %s already covered by node protection",

7
isisd/isis_sr.c
View file

@ -462,8 +462,7 @@ void isis_area_delete_backup_adj_sids(struct isis_area *area, int level)
struct listnode *node, *nnode; struct listnode *node, *nnode;
for (ALL_LIST_ELEMENTS(area->srdb.adj_sids, node, nnode, sra)) for (ALL_LIST_ELEMENTS(area->srdb.adj_sids, node, nnode, sra))
if (sra->type == ISIS_SR_LAN_BACKUP if (sra->type == ISIS_SR_ADJ_BACKUP && (sra->adj->level & level))
&& (sra->adj->level & level))
sr_adj_sid_del(sra); sr_adj_sid_del(sra);
} }
@ -689,7 +688,7 @@ void sr_adj_sid_add_single(struct isis_adjacency *adj, int family, bool backup,
circuit->ext = isis_alloc_ext_subtlvs(); circuit->ext = isis_alloc_ext_subtlvs();
sra = XCALLOC(MTYPE_ISIS_SR_INFO, sizeof(*sra)); sra = XCALLOC(MTYPE_ISIS_SR_INFO, sizeof(*sra));
sra->type = backup ? ISIS_SR_LAN_BACKUP : ISIS_SR_ADJ_NORMAL; sra->type = backup ? ISIS_SR_ADJ_BACKUP : ISIS_SR_ADJ_NORMAL;
sra->input_label = input_label; sra->input_label = input_label;
sra->nexthop.family = family; sra->nexthop.family = family;
sra->nexthop.address = nexthop; sra->nexthop.address = nexthop;
@ -819,7 +818,7 @@ static void sr_adj_sid_del(struct sr_adjacency *sra)
exit(1); exit(1);
} }
if (sra->type == ISIS_SR_LAN_BACKUP && sra->backup_nexthops) { if (sra->type == ISIS_SR_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_sr.h
View file

@ -82,7 +82,7 @@ struct sr_local_block {
/* Segment Routing Adjacency-SID type. */ /* Segment Routing Adjacency-SID type. */
enum sr_adj_type { enum sr_adj_type {
ISIS_SR_ADJ_NORMAL = 0, ISIS_SR_ADJ_NORMAL = 0,
ISIS_SR_LAN_BACKUP, ISIS_SR_ADJ_BACKUP,
}; };
/* Segment Routing Adjacency. */ /* Segment Routing Adjacency. */

2
isisd/isis_zebra.c
View file

@ -454,7 +454,7 @@ void isis_zebra_send_adjacency_sid(int cmd, const struct sr_adjacency *sra)
znh->labels[0] = MPLS_LABEL_IMPLICIT_NULL; znh->labels[0] = MPLS_LABEL_IMPLICIT_NULL;
/* Set backup nexthops. */ /* Set backup nexthops. */
if (sra->type == ISIS_SR_LAN_BACKUP) { if (sra->type == ISIS_SR_ADJ_BACKUP) {
int count; int count;
count = isis_zebra_add_nexthops(isis, sra->backup_nexthops, count = isis_zebra_add_nexthops(isis, sra->backup_nexthops,