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

Merge pull request #14158 from donaldsharp/listnode_stuff

Browse Source 
ospfd: Ensure listnode returns are usable
This commit is contained in:
Donatas Abraitis 2023-08-08 16:31:57 +03:00 committed by GitHub
commit 2352bbf1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ospfd/ospf_ti_lfa.c
View File

@ -64,6 +64,7 @@ ospf_ti_lfa_find_p_node(struct vertex *pc_node, struct p_space *p_space,
struct vertex_parent *pc_vertex_parent;
curr_node = listnode_lookup(q_space->pc_path, pc_node);
assert(curr_node);
pc_node_parent = listgetdata(curr_node->next);
q_space->p_node_info->type = OSPF_TI_LFA_UNDEFINED_NODE;
@ -105,6 +106,7 @@ static void ospf_ti_lfa_find_q_node(struct vertex *pc_node,
struct vertex_parent *pc_vertex_parent;
curr_node = listnode_lookup(q_space->pc_path, pc_node);
assert(curr_node);
next_node = curr_node->next;
pc_node_parent = listgetdata(next_node);
pc_vertex_parent =
@ -219,7 +221,7 @@ static struct list *ospf_ti_lfa_cut_out_pc_path(struct list *pc_vertex_list,
current_listnode = listnode_lookup(pc_path, current_vertex);
/* Note that the post-convergence paths are reversed. */
for (;;) {
while (current_listnode) {
current_vertex = listgetdata(current_listnode);
listnode_add(inner_pc_path, current_vertex);
@ -268,6 +270,7 @@ static void ospf_ti_lfa_generate_inner_label_stack(
end_label = MPLS_INVALID_LABEL;
if (p_node_info->node->id.s_addr == p_space->root->id.s_addr) {
pc_p_node = listnode_lookup(q_space->pc_path, p_space->pc_spf);
assert(pc_p_node);
start_vertex = listgetdata(pc_p_node->prev);
start_label = ospf_sr_get_adj_sid_by_id(&p_node_info->node->id,
&start_vertex->id);
@ -275,6 +278,7 @@ static void ospf_ti_lfa_generate_inner_label_stack(
if (q_node_info->node->id.s_addr == q_space->root->id.s_addr) {
pc_q_node = listnode_lookup(q_space->pc_path,
listnode_head(q_space->pc_path));
assert(pc_q_node);
end_vertex = listgetdata(pc_q_node->next);
end_label = ospf_sr_get_adj_sid_by_id(&end_vertex->id,
&q_node_info->node->id);