[ospfd] fix automatic router-id and network enable bug.
2006-01-10 Paul Jakma <paul.jakma@sun.com>
* ospfd.c: (ospf_network_run) checking to see if router-id
is set should be on ospf->router_id, not router_id_static.
This was causing ospfd to not start if router-id had not
been configured statically.
(ospf_if_update) ditto.
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index cf6fef7..9ec52cc 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-10 Paul Jakma <paul.jakma@sun.com>
+
+ * ospfd.c: (ospf_network_run) checking to see if router-id
+ is set should be on ospf->router_id, not router_id_static.
+ This was causing ospfd to not start if router-id had not
+ been configured statically.
+ (ospf_if_update) ditto.
+
2005-11-26 Paul Jakma <paul.jakma@sun.com>
* ospf_api.c: (struct opaque_lsa) change from gcc zero-length
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index d73d783..7c99365 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -825,7 +825,7 @@
struct listnode *node;
/* Schedule Router ID Update. */
- if (ospf->router_id_static.s_addr == 0)
+ if (ospf->router_id.s_addr == 0)
ospf_router_id_update (ospf);
/* Get target interface. */
@@ -907,7 +907,7 @@
* ospf_router_id_update() will call ospf_if_update
* whenever r-id is configured instead.
*/
- if ((ospf->router_id_static.s_addr != 0)
+ if ((ospf->router_id.s_addr != 0)
&& if_is_operative (ifp))
ospf_if_up (oi);
@@ -956,7 +956,7 @@
if (ospf != NULL)
{
/* Router-ID must be configured. */
- if (ospf->router_id_static.s_addr == 0)
+ if (ospf->router_id.s_addr == 0)
return;
/* Find interfaces that not configured already. */