From a2d2c0d2268863f6a6300f8e5b9df98276329fad Mon Sep 17 00:00:00 2001 From: Amritha Nambiar Date: Thu, 2 Jul 2015 15:42:58 -0700 Subject: [PATCH] isisd: Add new adjacency to LSP neighbor list isis_pdu.c : New adjacency did not always get added to LSP neighbor list. The adjacencies that were created once minimum time allowed before LSP retransmission had surpassed, instantly got their LSP regenerated, but the adjacency circuit type was not set to IIH PDU circuit type before the LSP was regenerated , hence didn't pass the check for adjacency circuit type in lsp_build(), and the adjacency was not added to neighbor list. When a new adjacency is up, to build LSP with neighbor entry corresponding to the adjacency, set adjacency circuit type to circuit type from hello PDU header before new LSP is regenerated/built. This will result in the new adjacency entry getting added to the LSP neighbor list TLV. Signed-off-by: Amritha Nambiar (cherry picked from commit 06cc655c0345d610eb946bd41968caa03dc118ed) --- isisd/isis_pdu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index d0b67501ba..70bc004b11 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -601,6 +601,13 @@ process_p2p_hello (struct isis_circuit *circuit) adj->level = hdr->circuit_t; } circuit->u.p2p.neighbor = adj; + /* Build lsp with the new neighbor entry when a new + * adjacency is formed. Set adjacency circuit type to + * IIH PDU header circuit type before lsp is regenerated + * when an adjacency is up. This will result in the new + * adjacency entry getting added to the lsp tlv neighbor list. + */ + adj->circuit_t = hdr->circuit_t; isis_adj_state_change (adj, ISIS_ADJ_INITIALIZING, NULL); adj->sys_type = ISIS_SYSTYPE_UNKNOWN; } @@ -886,7 +893,6 @@ process_p2p_hello (struct isis_circuit *circuit) break; } - adj->circuit_t = hdr->circuit_t; if (isis->debugs & DEBUG_ADJ_PACKETS) { -- 2.39.5