summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2005-06-01 11:20:51 +0000
committerpaul <paul>2005-06-01 11:20:51 +0000
commit7e440869b51dde1da44f6ffc26643838a1e2b36d (patch)
tree7d6f74f4b4be26f7bedc02faed6b410d16599a58
parent200df115ea0ba6f54151d60fe5e9a7f6948de7c3 (diff)
2005-06-01 Akihiro Mizutani <mizutani@net-chef.net>
* ospf_ism.c (ospf_elect_bdr/ospf_elect_dr): Fix DR election bug.
-rw-r--r--ospfd/ChangeLog4
-rw-r--r--ospfd/ospf_ism.c12
2 files changed, 7 insertions, 9 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 87411412..8717e897 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-01 Akihiro Mizutani <mizutani@net-chef.net>
+
+ * ospf_ism.c (ospf_elect_bdr/ospf_elect_dr): Fix DR election bug.
+
2005-05-26 Paul Jakma <paul.jakma@sun.com>
* ospf_abr.c: (ospf_abr_update_aggregate) Fix comment, cost bug itself
diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c
index b0442341..b251e590 100644
--- a/ospfd/ospf_ism.c
+++ b/ospfd/ospf_ism.c
@@ -99,12 +99,9 @@ ospf_elect_dr (struct ospf_interface *oi, struct list *el_list)
/* Set DR to interface. */
if (dr)
- {
- DR (oi) = dr->address.u.prefix4;
- dr->d_router = dr->address.u.prefix4;
- }
+ DR (oi) = dr->address.u.prefix4;
else
- DR (oi).s_addr = 0;
+ DR (oi).s_addr = 0;
list_delete (dr_list);
@@ -143,10 +140,7 @@ ospf_elect_bdr (struct ospf_interface *oi, struct list *el_list)
/* Set BDR to interface. */
if (bdr)
- {
- BDR (oi) = bdr->address.u.prefix4;
- bdr->bd_router = bdr->address.u.prefix4;
- }
+ BDR (oi) = bdr->address.u.prefix4;
else
BDR (oi).s_addr = 0;