[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).
This commit is contained in:
Andrew J. Schorr 2007-04-21 20:46:31 +00:00
parent 1d720daa61
commit e8a56f02ee
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,11 @@
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).
2007-03-23 Paul Jakma <paul.jakma@sun.com> 2007-03-23 Paul Jakma <paul.jakma@sun.com>
* ospf_spf.c: (various) Add more debug statements. * ospf_spf.c: (various) Add more debug statements.

View File

@ -717,7 +717,7 @@ ospf_if_set_multicast(struct ospf_interface *oi)
if ((oi->state > ISM_Loopback) && if ((oi->state > ISM_Loopback) &&
(oi->type != OSPF_IFTYPE_LOOPBACK) && (oi->type != OSPF_IFTYPE_LOOPBACK) &&
(oi->type != OSPF_IFTYPE_VIRTUALLINK) && (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. */ /* The interface should belong to the OSPF-all-routers group. */
if (!OI_MEMBER_CHECK(oi, MEMBER_ALLROUTERS) && 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) || if (((oi->type == OSPF_IFTYPE_BROADCAST) ||
(oi->type == OSPF_IFTYPE_POINTOPOINT)) && (oi->type == OSPF_IFTYPE_POINTOPOINT)) &&
((oi->state == ISM_DR) || (oi->state == ISM_Backup)) && ((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. */ /* The interface should belong to the OSPF-designated-routers group. */
if (!OI_MEMBER_CHECK(oi, MEMBER_DROUTERS) && if (!OI_MEMBER_CHECK(oi, MEMBER_DROUTERS) &&