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

Merge pull request #8974 from FRRouting/revert-8795-fix-ospf6-router-id

Browse Source 
Revert "ospf6d: fix LSAs remain in LSDB with an old router-id value"
This commit is contained in:
Christian Hopps 2021-07-03 19:40:03 -04:00 committed by GitHub
commit e49199c387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ospf6d/ospf6_asbr.c
View File

@ -2484,23 +2484,21 @@ void ospf6_asbr_redistribute_disable(struct ospf6 *ospf6)
int type;
struct ospf6_redist *red;
for (type = 0; type <= ZEBRA_ROUTE_MAX; type++) {
if (type == ZEBRA_ROUTE_OSPF6)
continue;
for (type = 0; type < ZEBRA_ROUTE_MAX; type++) {
red = ospf6_redist_lookup(ospf6, type, 0);
if (!red)
continue;
if (type == DEFAULT_ROUTE) {
ospf6_asbr_routemap_unset(red);
ospf6_redist_del(ospf6, red, type);
ospf6_redistribute_default_set(ospf6,
DEFAULT_ORIGINATE_NONE);
if (type == ZEBRA_ROUTE_OSPF6)
continue;
}
ospf6_asbr_redistribute_unset(ospf6, red, type);
ospf6_redist_del(ospf6, red, type);
}
red = ospf6_redist_lookup(ospf6, DEFAULT_ROUTE, 0);
if (red) {
ospf6_asbr_routemap_unset(red);
ospf6_redist_del(ospf6, red, type);
ospf6_redistribute_default_set(ospf6, DEFAULT_ORIGINATE_NONE);
}
}
void ospf6_asbr_redistribute_reset(struct ospf6 *ospf6)

67
ospf6d/ospf6_top.c
View File

@ -73,8 +73,6 @@ struct ospf6_master *om6;
static void ospf6_disable(struct ospf6 *o);
static void ospf6_process_reset(struct ospf6 *ospf6);
static void ospf6_add(struct ospf6 *ospf6)
{
listnode_add(om6->ospf6, ospf6);
@ -227,7 +225,7 @@ static int ospf6_vrf_enable(struct vrf *vrf)
thread_add_read(master, ospf6_receive, ospf6, ospf6->fd,
&ospf6->t_ospf6_receive);
ospf6_router_id_update(ospf6, true, NULL);
ospf6_router_id_update(ospf6);
}
}
@ -442,7 +440,7 @@ struct ospf6 *ospf6_instance_create(const char *name)
if (DFLT_OSPF6_LOG_ADJACENCY_CHANGES)
SET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES);
if (ospf6->router_id == 0)
ospf6_router_id_update(ospf6, true, NULL);
ospf6_router_id_update(ospf6);
ospf6_add(ospf6);
if (ospf6->vrf_id != VRF_UNKNOWN) {
vrf = vrf_lookup_by_id(ospf6->vrf_id);
@ -596,43 +594,15 @@ void ospf6_maxage_remove(struct ospf6 *o)
&o->maxage_remover);
}
void ospf6_router_id_update(struct ospf6 *ospf6, bool init, struct vty *vty)
void ospf6_router_id_update(struct ospf6 *ospf6)
{
in_addr_t new_router_id;
struct listnode *node;
struct ospf6_area *oa;
if (!ospf6)
return;
if (ospf6->router_id_static != 0)
new_router_id = ospf6->router_id_static;
ospf6->router_id = ospf6->router_id_static;
else
new_router_id = ospf6->router_id_zebra;
if (ospf6->router_id == new_router_id)
return;
if (!init)
for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, node, oa)) {
if (oa->full_nbrs) {
if (vty)
vty_out(vty,
"For this router-id change to take effect,"
" run the \"clear ipv6 ospf6 process\" command\n");
else
zlog_err(
"%s: cannot update router-id."
" Run the \"clear ipv6 ospf6 process\" command\n",
__func__);
return;
}
}
ospf6->router_id = new_router_id;
if (!init)
ospf6_process_reset(ospf6);
ospf6->router_id = ospf6->router_id_zebra;
}
/* start ospf6 */
@ -724,7 +694,7 @@ static void ospf6_process_reset(struct ospf6 *ospf6)
ospf6->inst_shutdown = 0;
ospf6_db_clear(ospf6);
ospf6_router_id_update(ospf6, true, NULL);
ospf6_router_id_update(ospf6);
ospf6_asbr_redistribute_reset(ospf6);
FOR_ALL_INTERFACES (vrf, ifp)
@ -768,6 +738,8 @@ DEFUN(ospf6_router_id,
int ret;
const char *router_id_str;
uint32_t router_id;
struct ospf6_area *oa;
struct listnode *node;
argv_find(argv, argc, "A.B.C.D", &idx);
router_id_str = argv[idx]->arg;
@ -780,7 +752,15 @@ DEFUN(ospf6_router_id,
o->router_id_static = router_id;
ospf6_router_id_update(o, false, vty);
for (ALL_LIST_ELEMENTS_RO(o->area_list, node, oa)) {
if (oa->full_nbrs) {
vty_out(vty,
"For this router-id change to take effect, run the \"clear ipv6 ospf6 process\" command\n");
return CMD_SUCCESS;
}
}
o->router_id = router_id;
return CMD_SUCCESS;
}
@ -793,10 +773,21 @@ DEFUN(no_ospf6_router_id,
V4NOTATION_STR)
{
VTY_DECLVAR_CONTEXT(ospf6, o);
struct ospf6_area *oa;
struct listnode *node;
o->router_id_static = 0;
ospf6_router_id_update(o, false, vty);
for (ALL_LIST_ELEMENTS_RO(o->area_list, node, oa)) {
if (oa->full_nbrs) {
vty_out(vty,
"For this router-id change to take effect, run the \"clear ipv6 ospf6 process\" command\n");
return CMD_SUCCESS;
}
}
o->router_id = 0;
if (o->router_id_zebra)
o->router_id = o->router_id_zebra;
return CMD_SUCCESS;
}

3
ospf6d/ospf6_top.h
View File

@ -178,8 +178,7 @@ extern void ospf6_master_init(struct thread_master *master);
extern void install_element_ospf6_clear_process(void);
extern void ospf6_top_init(void);
extern void ospf6_delete(struct ospf6 *o);
extern void ospf6_router_id_update(struct ospf6 *ospf6, bool init,
struct vty *vty);
extern void ospf6_router_id_update(struct ospf6 *ospf6);
extern void ospf6_maxage_remove(struct ospf6 *o);
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;
ospf6_router_id_update(o, false, NULL);
ospf6_router_id_update(o);
return 0;
}