summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2006-01-10 20:34:46 +0000
committerpaul <paul>2006-01-10 20:34:46 +0000
commit867528434d32102b02e2538dcaa7c86aaf47f695 (patch)
tree45c996e73efe19e105a26f441f5617948c98f6ba
parent067fca86323b189fabf4c64c0b9ccb98a458b981 (diff)
[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.
-rw-r--r--ospfd/ChangeLog8
-rw-r--r--ospfd/ospfd.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index cf6fef7f..9ec52ccd 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 d73d7836..7c993655 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -825,7 +825,7 @@ ospf_network_run (struct ospf *ospf, struct prefix *p, struct ospf_area *area)
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_network_run (struct ospf *ospf, struct prefix *p, struct ospf_area *area)
* 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 @@ ospf_if_update (struct ospf *ospf)
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. */