From: Alexander Chernavin <achernavin@netgate.com>
Date: Thu, 20 Jul 2023 15:22:03 +0000 (+0000)
Subject: ospfd: fix SPF calculation when changing ABR type
X-Git-Tag: base_9.1~189^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f050e57a2c5de88ccc6c96346c5c99a8571929d6;p=matthieu%2Ffrr.git

ospfd: fix SPF calculation when changing ABR type

Currently, when changing ABR type on a working router, SPF recalculation
will only be initiated if the OSPF flags have changed after this.
Otherwise, SPF recalculation will be omitted and OSPF RIB update will
not occur. In other words, changing ABR type might not result in
inter-area routes addition/deletion.

With this fix, when ABR type is changed, the command handler initiates
SPF recalculation.

Signed-off-by: Alexander Chernavin <achernavin@netgate.com>
---

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 1500d61b48..158e90df59 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2058,6 +2058,13 @@ DEFUN (ospf_abr_type,
 	if (ospf->abr_type != abr_type) {
 		ospf->abr_type = abr_type;
 		ospf_schedule_abr_task(ospf);
+
+		/* The ABR task might not initiate SPF recalculation if the
+		 * OSPF flags remain the same. And inter-area routes would not
+		 * be added/deleted according to the new ABR type. So this
+		 * needs to be done here too.
+		 */
+		ospf_spf_calculate_schedule(ospf, SPF_FLAG_ABR_STATUS_CHANGE);
 	}
 
 	return CMD_SUCCESS;