proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 02:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospf6d: don't update router-id if at least one adjacency is Full

Browse Source 
When a router-id change is notified by zebra to ospf6d, we only take
into account the change if no adjacencies are in Full state.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2021-06-04 14:22:06 +02:00
parent c36a440cba
commit 08965422d0
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ospf6d/ospf6_top.c
View File

@ -225,7 +225,7 @@ static int ospf6_vrf_enable(struct vrf *vrf)
thread_add_read(master, ospf6_receive, ospf6, ospf6->fd, thread_add_read(master, ospf6_receive, ospf6, ospf6->fd,
&ospf6->t_ospf6_receive); &ospf6->t_ospf6_receive);
ospf6_router_id_update(ospf6); ospf6_router_id_update(ospf6, true);
} }
} }
@ -440,7 +440,7 @@ struct ospf6 *ospf6_instance_create(const char *name)
if (DFLT_OSPF6_LOG_ADJACENCY_CHANGES) if (DFLT_OSPF6_LOG_ADJACENCY_CHANGES)
SET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES); SET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES);
if (ospf6->router_id == 0) if (ospf6->router_id == 0)
ospf6_router_id_update(ospf6); ospf6_router_id_update(ospf6, true);
ospf6_add(ospf6); ospf6_add(ospf6);
if (ospf6->vrf_id != VRF_UNKNOWN) { if (ospf6->vrf_id != VRF_UNKNOWN) {
vrf = vrf_lookup_by_id(ospf6->vrf_id); vrf = vrf_lookup_by_id(ospf6->vrf_id);
@ -594,15 +594,34 @@ void ospf6_maxage_remove(struct ospf6 *o)
&o->maxage_remover); &o->maxage_remover);
} }
void ospf6_router_id_update(struct ospf6 *ospf6) void ospf6_router_id_update(struct ospf6 *ospf6, bool init)
{ {
in_addr_t new_router_id;
struct listnode *node;
struct ospf6_area *oa;
if (!ospf6) if (!ospf6)
return; return;
if (ospf6->router_id_static != 0) if (ospf6->router_id_static != 0)
ospf6->router_id = ospf6->router_id_static; new_router_id = ospf6->router_id_static;
else else
ospf6->router_id = ospf6->router_id_zebra; new_router_id = ospf6->zebra_router_id;
if (ospf6->router_id == new_router_id)
return;
if (!init)
for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, node, oa)) {
if (oa->full_nbrs) {
zlog_err(
"%s: cannot update router-id. Save config and restart ospf6d\n",
__func__);
return;
}
}
ospf6->router_id = new_router_id;
} }
/* start ospf6 */ /* start ospf6 */
@ -694,7 +713,7 @@ static void ospf6_process_reset(struct ospf6 *ospf6)
ospf6->inst_shutdown = 0; ospf6->inst_shutdown = 0;
ospf6_db_clear(ospf6); ospf6_db_clear(ospf6);
ospf6_router_id_update(ospf6); ospf6_router_id_update(ospf6, true);
ospf6_asbr_redistribute_reset(ospf6); ospf6_asbr_redistribute_reset(ospf6);
FOR_ALL_INTERFACES (vrf, ifp) FOR_ALL_INTERFACES (vrf, ifp)

2
ospf6d/ospf6_top.h
View File

@ -175,7 +175,7 @@ extern void ospf6_master_init(struct thread_master *master);
extern void install_element_ospf6_clear_process(void); extern void install_element_ospf6_clear_process(void);
extern void ospf6_top_init(void); extern void ospf6_top_init(void);
extern void ospf6_delete(struct ospf6 *o); extern void ospf6_delete(struct ospf6 *o);
extern void ospf6_router_id_update(struct ospf6 *ospf6); extern void ospf6_router_id_update(struct ospf6 *ospf6, bool init);
extern void ospf6_maxage_remove(struct ospf6 *o); extern void ospf6_maxage_remove(struct ospf6 *o);
extern struct ospf6 *ospf6_instance_create(const char *name); extern struct ospf6 *ospf6_instance_create(const char *name);

2
ospf6d/ospf6_zebra.c
View File

@ -101,7 +101,7 @@ static int ospf6_router_id_update_zebra(ZAPI_CALLBACK_ARGS)
o->router_id_zebra = router_id.u.prefix4.s_addr; o->router_id_zebra = router_id.u.prefix4.s_addr;
ospf6_router_id_update(o); ospf6_router_id_update(o, false);
return 0; return 0;
} }