From: Louis Scalbert <louis.scalbert@6wind.com>
Date: Tue, 27 Aug 2024 16:22:27 +0000 (+0200)
Subject: isisd: fix update link params after circuit is up
X-Git-Tag: docker/10.1.1~5^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e3ff4870b953a9672f516c3312378f3f4954daa4;p=matthieu%2Ffrr.git

isisd: fix update link params after circuit is up

If the link-params are set when the circuit not yet up, the link-params
are never updated.

isis_link_params_update() is called from isis_circuit_up() but returns
immediately because circuit->state != C_STATE_UP. circuit->state is
updated in isis_csm_state_change after isis_circuit_up().

> struct isis_circuit *isis_csm_state_change(enum isis_circuit_event event,
> 					   struct isis_circuit *circuit,
> 					   void *arg)
> {
> [...]
> 			if (isis_circuit_up(circuit) != ISIS_OK) {
> 				isis_circuit_deconfigure(circuit, area);
> 				break;
> 			}
> 			circuit->state = C_STATE_UP;
> 			isis_event_circuit_state_change(circuit, circuit->area,
> 							1);

Do not return isis_link_params_update() if circuit->state != C_STATE_UP.

Fixes: 0fdd8b2b11 ("isisd: update link params after circuit is up")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit 6ce6b7a8564f661495fec17f3ea33eeaf9e2f48c)
---

diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index a2d08e615b..d854123647 100644
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -331,7 +331,7 @@ void isis_link_params_update(struct isis_circuit *circuit,
 		return;
 
 	/* Sanity Check */
-	if ((ifp == NULL) || (circuit->state != C_STATE_UP))
+	if (ifp == NULL)
 		return;
 
 	te_debug("ISIS-TE(%s): Update circuit parameters for interface %s",