From 7e440869b51dde1da44f6ffc26643838a1e2b36d Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 1 Jun 2005 11:20:51 +0000 Subject: 2005-06-01 Akihiro Mizutani * ospf_ism.c (ospf_elect_bdr/ospf_elect_dr): Fix DR election bug. --- ospfd/ChangeLog | 4 ++++ ospfd/ospf_ism.c | 12 +++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index 874114124..8717e8973 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -1,3 +1,7 @@ +2005-06-01 Akihiro Mizutani + + * ospf_ism.c (ospf_elect_bdr/ospf_elect_dr): Fix DR election bug. + 2005-05-26 Paul Jakma * 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 b04423411..b251e5906 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; -- cgit v1.2.3