2005-06-01 Akihiro Mizutani <mizutani@net-chef.net>

	* ospf_ism.c (ospf_elect_bdr/ospf_elect_dr): Fix DR election bug.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 8741141241314d60748a80b0bfa008cc3b8ec8e8..8717e8973d0cb8eaf0b051884c703a9ed0314b43 100644 (file)
--- 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 b044234118924f95ca09ccca259dd3b11fb382bd..b251e59063a8b7621465201f9089336c28c3ced0 100644 (file)
--- 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;