ospf6d: do not allow an area to be stub and NSSA at the same time

That should not be allowed under any circumstance. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
LabNConsulting · Aug 24, 2021 · 0c293b9 · 0c293b9
1 parent 9142948
commit 0c293b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
@@ -189,14 +189,17 @@ static void ospf6_area_stub_update(struct ospf6_area *area)
 static int ospf6_area_stub_set(struct ospf6 *ospf6, struct ospf6_area *area)
 {
 	if (!IS_AREA_STUB(area)) {
+		/* Disable NSSA first. */
+		ospf6_area_nssa_unset(ospf6, area);
+
 		SET_FLAG(area->flag, OSPF6_AREA_STUB);
 		ospf6_area_stub_update(area);
 	}
 
 	return 1;
 }
 
-static void ospf6_area_stub_unset(struct ospf6 *ospf6, struct ospf6_area *area)
+void ospf6_area_stub_unset(struct ospf6 *ospf6, struct ospf6_area *area)
 {
 	if (IS_AREA_STUB(area)) {
 		UNSET_FLAG(area->flag, OSPF6_AREA_STUB);
@@ -1266,6 +1269,8 @@ DEFUN(ospf6_area_nssa, ospf6_area_nssa_cmd,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
+	ospf6_area_no_summary_unset(ospf6, area);
+
 	return CMD_SUCCESS;
 }
 

diff --git a/ospf6d/ospf6_area.h b/ospf6d/ospf6_area.h
@@ -154,6 +154,7 @@ extern void ospf6_area_delete(struct ospf6_area *);
 extern struct ospf6_area *ospf6_area_lookup(uint32_t, struct ospf6 *);
 extern struct ospf6_area *ospf6_area_lookup_by_area_id(uint32_t area_id);
 
+extern void ospf6_area_stub_unset(struct ospf6 *ospf6, struct ospf6_area *area);
 extern void ospf6_area_enable(struct ospf6_area *);
 extern void ospf6_area_disable(struct ospf6_area *);
 

diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c
@@ -1198,7 +1198,7 @@ static void ospf6_check_and_originate_type7_lsa(struct ospf6_area *area)
 
 }
 
-static void ospf6_area_nssa_update(struct ospf6_area *area)
+void ospf6_area_nssa_update(struct ospf6_area *area)
 {
 	if (IS_AREA_NSSA(area)) {
 		OSPF6_OPT_CLEAR(area->options, OSPF6_OPT_E);
@@ -1246,6 +1246,9 @@ int ospf6_area_nssa_set(struct ospf6 *ospf6, struct ospf6_area *area)
 {
 
 	if (!IS_AREA_NSSA(area)) {
+		/* Disable stub first. */
+		ospf6_area_stub_unset(ospf6, area);
+
 		SET_FLAG(area->flag, OSPF6_AREA_NSSA);
 		if (IS_OSPF6_DEBUG_NSSA)
 			zlog_debug("area %s nssa set", area->name);

diff --git a/ospf6d/ospf6_nssa.h b/ospf6d/ospf6_nssa.h
@@ -61,6 +61,7 @@ extern struct ospf6_lsa *ospf6_translated_nssa_originate(struct ospf6_area *,
 extern void ospf6_asbr_nssa_redist_task(struct ospf6 *ospf6);
 
 extern void ospf6_schedule_abr_task(struct ospf6 *ospf6);
+extern void ospf6_area_nssa_update(struct ospf6_area *area);
 void ospf6_asbr_prefix_readvertise(struct ospf6 *ospf6);
 extern void ospf6_nssa_lsa_originate(struct ospf6_route *route,
 				     struct ospf6_area *area);