diff options
| author | ajs <ajs> | 2007-04-21 20:46:31 +0000 |
|---|---|---|
| committer | ajs <ajs> | 2007-04-21 20:46:31 +0000 |
| commit | 0742120b03e099e4cf1c9d918beff55ca6f857ad (patch) | |
| tree | b72bfff74915d9c48b81d6e572955d3b08c13a69 /ospfd/ospf_interface.c | |
| parent | bc2b4935075bb9f7e9528321829d61c52d9d5f18 (diff) | |
| download | quagga-0742120b03e099e4cf1c9d918beff55ca6f857ad.tar.bz2 quagga-0742120b03e099e4cf1c9d918beff55ca6f857ad.tar.xz | |
[ospfd] Fix bug in 'passive-interface default' behavior
2007-04-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_interface.c: (ospf_if_set_multicast) Fix bug: was testing
interface passive status improperly in light of the recent
'passive-interface default' patch. Now need to test
OSPF_IF_PASSIVE_STATUS(oi) instead of
OSPF_IF_PARAM(oi, passive_interface).
Diffstat (limited to 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 4b6b424d..bf53668b 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -717,7 +717,7 @@ ospf_if_set_multicast(struct ospf_interface *oi) if ((oi->state > ISM_Loopback) && (oi->type != OSPF_IFTYPE_LOOPBACK) && (oi->type != OSPF_IFTYPE_VIRTUALLINK) && - (OSPF_IF_PARAM(oi, passive_interface) == OSPF_IF_ACTIVE)) + (OSPF_IF_PASSIVE_STATUS(oi) == OSPF_IF_ACTIVE)) { /* The interface should belong to the OSPF-all-routers group. */ if (!OI_MEMBER_CHECK(oi, MEMBER_ALLROUTERS) && @@ -745,7 +745,7 @@ ospf_if_set_multicast(struct ospf_interface *oi) if (((oi->type == OSPF_IFTYPE_BROADCAST) || (oi->type == OSPF_IFTYPE_POINTOPOINT)) && ((oi->state == ISM_DR) || (oi->state == ISM_Backup)) && - (OSPF_IF_PARAM(oi, passive_interface) == OSPF_IF_ACTIVE)) + (OSPF_IF_PASSIVE_STATUS(oi) == OSPF_IF_ACTIVE)) { /* The interface should belong to the OSPF-designated-routers group. */ if (!OI_MEMBER_CHECK(oi, MEMBER_DROUTERS) && |