diff options
Diffstat (limited to 'ospf6d/ospf6_top.c')
| -rw-r--r-- | ospf6d/ospf6_top.c | 67 |
1 files changed, 29 insertions, 38 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index d4557e0ef6..6f40989efd 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -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; } |