commit e8a56f02ee52a0a4f06440f4dfef86a21e6ce5c1
author Andrew J. Schorr <ajschorr@alumni.princeton.edu> Sat Apr 21 20:46:31 2007 +0000
committer Andrew J. Schorr <ajschorr@alumni.princeton.edu> Sat Apr 21 20:46:31 2007 +0000
tree 3c7ba00f3e9c7185f242f2a90afeb1e0c3abb4e1
parent 1d720daa61692f9754d500ff530614798b8b3bf2

[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).

ospfd/ospf_interface.c

diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 4b6b424..bf53668 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -717,7 +717,7 @@
   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 @@
   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) &&