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

Revert "isisd: fix infinite loop when parsing LSPs"

Browse Source 
This reverts commit 5e56a50559.
This commit is contained in:
Louis Scalbert 2022-05-27 10:37:08 +02:00
parent 03c95c540f
commit cab7be7d5b
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
isisd/isis_spf.c
View File

@ -1400,13 +1400,14 @@ static void spf_adj_list_parse_tlv(struct isis_spftree *spftree,
spf_adj_list_parse_lsp(spftree, adj_list, lsp, id, metric); spf_adj_list_parse_lsp(spftree, adj_list, lsp, id, metric);
} }
static void spf_adj_list_parse_lsp_frag(struct isis_spftree *spftree, static void spf_adj_list_parse_lsp(struct isis_spftree *spftree,
struct list *adj_list, struct list *adj_list, struct isis_lsp *lsp,
struct isis_lsp *lsp, const uint8_t *pseudo_nodeid,
const uint8_t *pseudo_nodeid, uint32_t pseudo_metric)
uint32_t pseudo_metric)
{ {
bool pseudo_lsp = LSP_PSEUDO_ID(lsp->hdr.lsp_id); bool pseudo_lsp = LSP_PSEUDO_ID(lsp->hdr.lsp_id);
struct isis_lsp *frag;
struct listnode *node;
struct isis_item *head; struct isis_item *head;
struct isis_item_list *te_neighs; struct isis_item_list *te_neighs;
@ -1444,27 +1445,14 @@ static void spf_adj_list_parse_lsp_frag(struct isis_spftree *spftree,
} }
} }
} }
}
static void spf_adj_list_parse_lsp(struct isis_spftree *spftree,
struct list *adj_list, struct isis_lsp *lsp,
const uint8_t *pseudo_nodeid,
uint32_t pseudo_metric)
{
struct isis_lsp *frag;
struct listnode *node;
spf_adj_list_parse_lsp_frag(spftree, adj_list, lsp, pseudo_nodeid,
pseudo_metric);
/* Parse LSP fragments. */ /* Parse LSP fragments. */
for (ALL_LIST_ELEMENTS_RO(lsp->lspu.frags, node, frag)) { for (ALL_LIST_ELEMENTS_RO(lsp->lspu.frags, node, frag)) {
if (!frag->tlvs) if (!frag->tlvs)
continue; continue;
spf_adj_list_parse_lsp_frag(spftree, adj_list, frag, spf_adj_list_parse_lsp(spftree, adj_list, frag, pseudo_nodeid,
pseudo_nodeid, pseudo_metric); pseudo_metric);
} }
} }