proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 11:18:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
That should not be allowed under any circumstance.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2021-08-19 12:14:47 -03:00
parent 9142948e39
commit 0c293b92ee
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ospf6d/ospf6_area.c
View File

@ -189,6 +189,9 @@ static void ospf6_area_stub_update(struct ospf6_area *area)
static int ospf6_area_stub_set(struct ospf6 *ospf6, struct ospf6_area *area) static int ospf6_area_stub_set(struct ospf6 *ospf6, struct ospf6_area *area)
{ {
if (!IS_AREA_STUB(area)) { if (!IS_AREA_STUB(area)) {
/* Disable NSSA first. */
ospf6_area_nssa_unset(ospf6, area);
SET_FLAG(area->flag, OSPF6_AREA_STUB); SET_FLAG(area->flag, OSPF6_AREA_STUB);
ospf6_area_stub_update(area); ospf6_area_stub_update(area);
} }
@ -196,7 +199,7 @@ static int ospf6_area_stub_set(struct ospf6 *ospf6, struct ospf6_area *area)
return 1; 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)) { if (IS_AREA_STUB(area)) {
UNSET_FLAG(area->flag, OSPF6_AREA_STUB); UNSET_FLAG(area->flag, OSPF6_AREA_STUB);
@ -1266,6 +1269,8 @@ DEFUN(ospf6_area_nssa, ospf6_area_nssa_cmd,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
ospf6_area_no_summary_unset(ospf6, area);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

1
ospf6d/ospf6_area.h
View File

@ -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(uint32_t, struct ospf6 *);
extern struct ospf6_area *ospf6_area_lookup_by_area_id(uint32_t area_id); 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_enable(struct ospf6_area *);
extern void ospf6_area_disable(struct ospf6_area *); extern void ospf6_area_disable(struct ospf6_area *);

5
ospf6d/ospf6_nssa.c
View File

@ -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)) { if (IS_AREA_NSSA(area)) {
OSPF6_OPT_CLEAR(area->options, OSPF6_OPT_E); 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)) { if (!IS_AREA_NSSA(area)) {
/* Disable stub first. */
ospf6_area_stub_unset(ospf6, area);
SET_FLAG(area->flag, OSPF6_AREA_NSSA); SET_FLAG(area->flag, OSPF6_AREA_NSSA);
if (IS_OSPF6_DEBUG_NSSA) if (IS_OSPF6_DEBUG_NSSA)
zlog_debug("area %s nssa set", area->name); zlog_debug("area %s nssa set", area->name);

1
ospf6d/ospf6_nssa.h
View File

@ -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_asbr_nssa_redist_task(struct ospf6 *ospf6);
extern void ospf6_schedule_abr_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); void ospf6_asbr_prefix_readvertise(struct ospf6 *ospf6);
extern void ospf6_nssa_lsa_originate(struct ospf6_route *route, extern void ospf6_nssa_lsa_originate(struct ospf6_route *route,
struct ospf6_area *area); struct ospf6_area *area);