summaryrefslogtreecommitdiff
path: root/ospfd/ospfd.c
diff options
context:
space:
mode:
Diffstat (limited to 'ospfd/ospfd.c')
-rw-r--r--ospfd/ospfd.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index ef8272b0..95615e4a 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -84,8 +84,17 @@ ospf_router_id_update (struct ospf *ospf)
router_id_old = ospf->router_id;
+ /* 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.
+ */
if (ospf->router_id_static.s_addr != 0)
router_id = ospf->router_id_static;
+ else if (ospf->router_id.s_addr != 0)
+ router_id = ospf->router_id;
else
router_id = router_id_zebra;