diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:40:32 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:40:32 +0100 |
| commit | 08e2c2ee9044a14f2cd9d382eec8f96189520160 (patch) | |
| tree | e682f22202430d2b24a0e2d3bd5e2a09252060ef /ospfd/ospf_nsm.c | |
| parent | 8cb411f192a3d6929d059b96e7750295629226de (diff) | |
| parent | 77f990188b526ea9ad3521980aee1d6faca8bb57 (diff) | |
| download | quagga-08e2c2ee9044a14f2cd9d382eec8f96189520160.tar.bz2 quagga-08e2c2ee9044a14f2cd9d382eec8f96189520160.tar.xz | |
Merge branch 'merged/ospfd' into dn42
Diffstat (limited to 'ospfd/ospf_nsm.c')
| -rw-r--r-- | ospfd/ospf_nsm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index 15fff349..b15efbd6 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -153,8 +153,8 @@ nsm_should_adj (struct ospf_neighbor *nbr) || IPV4_ADDR_SAME (&oi->address->u.prefix4, &DR (oi)) || IPV4_ADDR_SAME (&oi->address->u.prefix4, &BDR (oi)) /* Neighboring Router is the DRouter or the BDRouter. */ - || IPV4_ADDR_SAME (&nbr->address.u.prefix4, &DR (oi)) - || IPV4_ADDR_SAME (&nbr->address.u.prefix4, &BDR (oi))) + || IPV4_ADDR_SAME (&nbr->src, &DR (oi)) + || IPV4_ADDR_SAME (&nbr->src, &BDR (oi))) return 1; return 0; @@ -393,7 +393,7 @@ nsm_kill_nbr (struct ospf_neighbor *nbr) if (IS_DEBUG_OSPF (nsm, NSM_EVENTS)) zlog_debug ("NSM[%s:%s]: Down (PollIntervalTimer scheduled)", - IF_NAME (nbr->oi), inet_ntoa (nbr->address.u.prefix4)); + IF_NAME (nbr->oi), inet_ntoa (nbr->src)); } return 0; |