From: Emanuele Di Pascale <emanuele@voltanet.io>
Date: Wed, 23 Sep 2020 14:37:21 +0000 (+0200)
Subject: isisd: simplify adj_change hook call
X-Git-Tag: base_7.6~493^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e4229afd5fdb7bb0921683c877226b41d657b1cf;p=mirror%2Ffrr.git

isisd: simplify adj_change hook call

There is no need to call isis_adj_state_change_hook once per level
in isis_adj_state_change, we can just do it once at the end.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
---

diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index f7cdd58f72..f0cf93ac4b 100644
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -304,7 +304,6 @@ void isis_adj_state_change(struct isis_adjacency **padj,
 				continue;
 			if (new_state == ISIS_ADJ_UP) {
 				circuit->upadjcount[level - 1]++;
-				hook_call(isis_adj_state_change_hook, adj);
 				/* update counter & timers for debugging
 				 * purposes */
 				adj->last_flap = time(NULL);
@@ -317,7 +316,6 @@ void isis_adj_state_change(struct isis_adjacency **padj,
 				if (circuit->upadjcount[level - 1] == 0)
 					isis_tx_queue_clean(circuit->tx_queue);
 
-				hook_call(isis_adj_state_change_hook, adj);
 				if (new_state == ISIS_ADJ_DOWN)
 					del = true;
 			}
@@ -342,7 +340,6 @@ void isis_adj_state_change(struct isis_adjacency **padj,
 				continue;
 			if (new_state == ISIS_ADJ_UP) {
 				circuit->upadjcount[level - 1]++;
-				hook_call(isis_adj_state_change_hook, adj);
 
 				/* update counter & timers for debugging
 				 * purposes */
@@ -365,13 +362,14 @@ void isis_adj_state_change(struct isis_adjacency **padj,
 				if (circuit->upadjcount[level - 1] == 0)
 					isis_tx_queue_clean(circuit->tx_queue);
 
-				hook_call(isis_adj_state_change_hook, adj);
 				if (new_state == ISIS_ADJ_DOWN)
 					del = true;
 			}
 		}
 	}
 
+	hook_call(isis_adj_state_change_hook, adj);
+
 	if (del) {
 		isis_delete_adj(adj);
 		*padj = NULL;