matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #17319 from opensourcerouting/fix/no_ospf_router-id

Browse source 
ospfd: Use router_id what Zebra has if we remove a static router_id
This commit is contained in:
Russ White 2024-11-05 10:19:44 -05:00 committed by GitHub
parent 318e983a59 1073e0f9b3
commit 408decfd77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ospfd/ospf_vty.c
View file

@ -339,6 +339,12 @@ DEFPY (no_ospf_router_id,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS_HIDDEN (no_ospf_router_id,
no_router_id_cmd,
"no router-id [A.B.C.D]",
NO_STR
"router-id for the OSPF process\n"
"OSPF router-id in IP address format\n")
static void ospf_passive_interface_default_update(struct ospf *ospf, static void ospf_passive_interface_default_update(struct ospf *ospf,
uint8_t newval) uint8_t newval)
@ -13603,6 +13609,7 @@ void ospf_vty_init(void)
install_element(OSPF_NODE, &ospf_router_id_cmd); install_element(OSPF_NODE, &ospf_router_id_cmd);
install_element(OSPF_NODE, &ospf_router_id_old_cmd); install_element(OSPF_NODE, &ospf_router_id_old_cmd);
install_element(OSPF_NODE, &no_ospf_router_id_cmd); install_element(OSPF_NODE, &no_ospf_router_id_cmd);
install_element(OSPF_NODE, &no_router_id_cmd);
/* "passive-interface" commands. */ /* "passive-interface" commands. */
install_element(OSPF_NODE, &ospf_passive_interface_default_cmd); install_element(OSPF_NODE, &ospf_passive_interface_default_cmd);

7
ospfd/ospfd.c
View file

@ -147,15 +147,10 @@ void ospf_process_refresh_data(struct ospf *ospf, bool reset)
/* Select the router ID based on these priorities: /* Select the router ID based on these priorities:
1. Statically assigned router ID is always the first choice. 1. Statically assigned router ID is always the first choice.
2. If there is no statically assigned router ID, then try to stick 2. Just go with whatever the zebra daemon recommends.
with the most recent value, since changing router ID's is very
disruptive.
3. Last choice: just go with whatever the zebra daemon recommends.
*/ */
if (ospf->router_id_static.s_addr != INADDR_ANY) if (ospf->router_id_static.s_addr != INADDR_ANY)
router_id = ospf->router_id_static; router_id = ospf->router_id_static;
else if (ospf->router_id.s_addr != INADDR_ANY)
router_id = ospf->router_id;
else else
router_id = ospf->router_id_zebra; router_id = ospf->router_id_zebra;