[Xorp-cvs] SF.net SVN: xorp:[11524] trunk/xorp

[bms_fbsd at users.sourceforge.net]

Revision: 11524
          http://xorp.svn.sourceforge.net/xorp/?rev=11524&view=rev
Author:   bms_fbsd
Date:     2009-08-27 14:45:39 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
In IGMP/MLD/PIM, do not check carrier sense of configured interface
during startup; the lack of carrier may be a transient condition, and
these protocols should only be checking the administrative state
of the interface.

Bugzilla URL:	http://bugzilla.xorp.org/show_bug.cgi?id=560
Submitted by:	Heiko Hupp

Modified Paths:
--------------
    trunk/xorp/fea/mfea_node.cc
    trunk/xorp/mld6igmp/mld6igmp_node.cc
    trunk/xorp/pim/pim_node.cc

Modified: trunk/xorp/fea/mfea_node.cc
===================================================================
--- trunk/xorp/fea/mfea_node.cc	2009-08-27 11:09:18 UTC (rev 11523)
+++ trunk/xorp/fea/mfea_node.cc	2009-08-27 14:45:39 UTC (rev 11524)
@@ -434,7 +434,6 @@
 	return;		// No IfTreeVif to consider
 
     is_up = ifp->enabled();
-    is_up &= (! ifp->no_carrier());
     is_up &= vifp->enabled();
     ProtoNode<MfeaVif>::set_config_vif_flags(ifname,
 					     false,	// is_pim_register
@@ -561,7 +560,6 @@
     // Update the vif flags
     //
     is_up = ifp->enabled();
-    is_up &= (! ifp->no_carrier());
     is_up &= vifp->enabled();
     ProtoNode<MfeaVif>::set_config_vif_flags(vifname,
 					     false,	// is_pim_register

Modified: trunk/xorp/mld6igmp/mld6igmp_node.cc
===================================================================
--- trunk/xorp/mld6igmp/mld6igmp_node.cc	2009-08-27 11:09:18 UTC (rev 11523)
+++ trunk/xorp/mld6igmp/mld6igmp_node.cc	2009-08-27 14:45:39 UTC (rev 11524)
@@ -436,7 +436,6 @@
 	    // Update the vif flags
 	    //
 	    bool is_up = ifmgr_iface.enabled();
-	    is_up &= (! ifmgr_iface.no_carrier());
 	    is_up &= ifmgr_vif.enabled();
 	    set_config_vif_flags(ifmgr_vif_name,
 				 ifmgr_vif.pim_register(),

Modified: trunk/xorp/pim/pim_node.cc
===================================================================
--- trunk/xorp/pim/pim_node.cc	2009-08-27 11:09:18 UTC (rev 11523)
+++ trunk/xorp/pim/pim_node.cc	2009-08-27 14:45:39 UTC (rev 11524)
@@ -473,7 +473,6 @@
 	    // Update the vif flags
 	    //
 	    bool is_up = ifmgr_iface.enabled();
-	    is_up &= (! ifmgr_iface.no_carrier());
 	    is_up &= ifmgr_vif.enabled();
 	    set_config_vif_flags(ifmgr_vif_name,
 				 ifmgr_vif.pim_register(),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.