Merge pull request FRRouting#17044 from baozhen-H3C/202410091476

isisd: Lsp fragments will delete the corresponding dyn_cache entry.
opensourcerouting · Oct 10, 2024 · 1014901 · 1014901
2 parents cc7d89a + c2b7036
commit 1014901
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
@@ -119,6 +119,10 @@ static void lsp_destroy(struct isis_lsp *lsp)
  lsp_clear_data(lsp);
 
  if (!LSP_FRAGMENT(lsp->hdr.lsp_id)) {
+ /* Only non-pseudo nodes and non-fragment LSPs can delete nodes. */
+ if (!LSP_PSEUDO_ID(lsp->hdr.lsp_id))
+ isis_dynhn_remove(lsp->area->isis, lsp->hdr.lsp_id);
+
  if (lsp->lspu.frags) {
  lsp_remove_frags(&lsp->area->lspdb[lsp->level - 1],
  lsp->lspu.frags);
@@ -2209,10 +2213,6 @@ void lsp_tick(struct event *thread)
  &area->lspdb[level],
  next);
 
- if (!LSP_PSEUDO_ID(lsp->hdr.lsp_id))
- isis_dynhn_remove(area->isis,
- lsp->hdr.lsp_id);
-
  lspdb_del(&area->lspdb[level], lsp);
  lsp_destroy(lsp);
  lsp = NULL;