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

isisd: Fix sending of LSP with null seqno

Browse Source 
Check sequence number when building LSP missing in received CSNP

Signed-off-by: Guillaume Solignac <gsoligna@protonmail.com>
This commit is contained in:
Guillaume Solignac 2021-05-27 09:34:37 +02:00 committed by gsol10
parent 3e324ff419
commit 9482949688
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
isisd/isis_lsp.c
View File

@ -641,7 +641,7 @@ void lsp_insert(struct lspdb_head *head, struct isis_lsp *lsp)
} }
/* /*
* Build a list of LSPs with non-zero ht bounded by start and stop ids * Build a list of LSPs with non-zero ht and seqno bounded by start and stop ids
*/ */
void lsp_build_list_nonzero_ht(struct lspdb_head *head, const uint8_t *start_id, void lsp_build_list_nonzero_ht(struct lspdb_head *head, const uint8_t *start_id,
const uint8_t *stop_id, struct list *list) const uint8_t *stop_id, struct list *list)
@ -657,7 +657,7 @@ void lsp_build_list_nonzero_ht(struct lspdb_head *head, const uint8_t *start_id,
ISIS_SYS_ID_LEN + 2) > 0) ISIS_SYS_ID_LEN + 2) > 0)
break; break;
if (lsp->hdr.rem_lifetime) if (lsp->hdr.rem_lifetime && lsp->hdr.seqno)
listnode_add(list, lsp); listnode_add(list, lsp);
} }
} }

12
tests/isisd/test_isis_lspdb.c
View File

@ -23,15 +23,15 @@ static void test_lsp_build_list_nonzero_ht(void)
struct lspdb_head _lspdb, *lspdb = &_lspdb; struct lspdb_head _lspdb, *lspdb = &_lspdb;
lsp_db_init(&_lspdb); lsp_db_init(&_lspdb);
struct isis_lsp *lsp1 = lsp_new(area, lsp_id1, 6000, 0, 0, 0, NULL, struct isis_lsp *lsp1 =
ISIS_LEVEL2); lsp_new(area, lsp_id1, 6000, 1, 0, 0, NULL, ISIS_LEVEL2);
lsp_insert(lspdb, lsp1); lspdb_add(lspdb, lsp1);
struct isis_lsp *lsp2 = lsp_new(area, lsp_id2, 6000, 0, 0, 0, NULL, struct isis_lsp *lsp2 =
ISIS_LEVEL2); lsp_new(area, lsp_id2, 6000, 1, 0, 0, NULL, ISIS_LEVEL2);
lsp_insert(lspdb, lsp2); lspdb_add(lspdb, lsp2);
struct list *list = list_new(); struct list *list = list_new();