diff options
| author | Russ White <russ@riw.us> | 2024-11-05 16:19:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-05 16:19:44 +0100 |
| commit | 408decfd77066d8ba7977b6d1af29ad80902971c (patch) | |
| tree | c6d2435c90404aeff77f2f5f40218863b03c2b59 /ospfd/ospfd.c | |
| parent | Merge pull request #17305 from opensourcerouting/fix/bgp_community_list_numbered (diff) | |
| parent | ospfd: Use router_id what Zebra has if we remove a static router_id (diff) | |
| download | frr-408decfd77066d8ba7977b6d1af29ad80902971c.tar.xz frr-408decfd77066d8ba7977b6d1af29ad80902971c.zip | |
Merge pull request #17319 from opensourcerouting/fix/no_ospf_router-id
ospfd: Use router_id what Zebra has if we remove a static router_id
Diffstat (limited to 'ospfd/ospfd.c')
| -rw-r--r-- | ospfd/ospfd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 7638e979a..d72afec1e 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -147,15 +147,10 @@ void ospf_process_refresh_data(struct ospf *ospf, bool reset) /* Select the router ID based on these priorities: 1. Statically assigned router ID is always the first choice. - 2. If there is no statically assigned router ID, then try to stick - with the most recent value, since changing router ID's is very - disruptive. - 3. Last choice: just go with whatever the zebra daemon recommends. + 2. Just go with whatever the zebra daemon recommends. */ if (ospf->router_id_static.s_addr != INADDR_ANY) router_id = ospf->router_id_static; - else if (ospf->router_id.s_addr != INADDR_ANY) - router_id = ospf->router_id; else router_id = ospf->router_id_zebra; |