[Xorp-cvs] SF.net SVN: xorp:[11562] trunk/xorp/contrib/olsr/neighborhood.cc

[bms_fbsd at users.sourceforge.net]

Revision: 11562
          http://xorp.svn.sourceforge.net/xorp/?rev=11562&view=rev
Author:   bms_fbsd
Date:     2009-10-01 10:06:34 +0000 (Thu, 01 Oct 2009)

Log Message:
-----------
In Neighborhood::consider_remaining_cand_mprs(), do not screen out
N already designated as MPRs when populating the cand-MPR set; this
is premature optimization.

Candidate MPR selection needs to consider the whole MPR space, even
if existing candidates are likely to win. Just because an N was
previously chosen as an MPR to cover a poorly reachable N2, does not
mean all its N2 are covered by the time this method runs.

Submitted by:	Ben Greear

Modified Paths:
--------------
    trunk/xorp/contrib/olsr/neighborhood.cc

Modified: trunk/xorp/contrib/olsr/neighborhood.cc
===================================================================
--- trunk/xorp/contrib/olsr/neighborhood.cc	2009-09-30 23:40:52 UTC (rev 11561)
+++ trunk/xorp/contrib/olsr/neighborhood.cc	2009-10-01 10:06:34 UTC (rev 11562)
@@ -1878,7 +1878,7 @@
     map<OlsrTypes::NeighborID, Neighbor*>::iterator ii;
     for (ii = _neighbors.begin(); ii != _neighbors.end(); ii++) {
 	Neighbor* n = (*ii).second;
-	if (! n->is_mpr() && n->is_cand_mpr() &&
+	if (n->is_cand_mpr() &&
 	    n->willingness() != OlsrTypes::WILL_ALWAYS) {
 	    // 8.4.1, 4.1:
 	    // Recompute n's reachability. We cannot amortize or


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