F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 733: OLSR MPR Computation give incorrect result

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2009-11-01 22:47:04 +00:00
parent acaad3a93d
commit 4fe473bca2
1 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/routing/olsr/olsr-routing-protocol.cc
View File

@@ -552,7 +552,23 @@ RoutingProtocol::MprComputation()
}
}
NS_LOG_DEBUG ("Size of N2: " << N2.size ());
#ifdef NS3_LOG_ENABLE
{
std::ostringstream os;
os << "[";
for (TwoHopNeighborSet::const_iterator iter = N2.begin ();
iter != N2.end (); iter++)
{
TwoHopNeighborSet::const_iterator next = iter;
next++;
os << iter->neighborMainAddr << "->" << iter->twoHopNeighborAddr;
if (next != N2.end ())
os << ", ";
}
os << "]";
NS_LOG_DEBUG ("N2: " << os.str ());
}
#endif //NS3_LOG_ENABLE
// 1. Start with an MPR set made of all members of N with
// N_willingness equal to WILL_ALWAYS
@@ -584,30 +600,37 @@ RoutingProtocol::MprComputation()
// 3. Add to the MPR set those nodes in N, which are the *only*
// nodes to provide reachability to a node in N2.
std::set<Ipv4Address> coveredTwoHopNeighbors;
for (TwoHopNeighborSet::iterator twoHopNeigh = N2.begin (); twoHopNeigh != N2.end (); twoHopNeigh++)
for (TwoHopNeighborSet::const_iterator twoHopNeigh = N2.begin (); twoHopNeigh != N2.end (); twoHopNeigh++)
{
NeighborSet::const_iterator onlyNeighbor = N.end ();
for (NeighborSet::const_iterator neighbor = N.begin ();
neighbor != N.end (); neighbor++)
bool onlyOne = true;
// try to find another neighbor that can reach twoHopNeigh->twoHopNeighborAddr
for (TwoHopNeighborSet::const_iterator otherTwoHopNeigh = N2.begin (); otherTwoHopNeigh != N2.end (); otherTwoHopNeigh++)
{
if (neighbor->neighborMainAddr == twoHopNeigh->neighborMainAddr)
if (otherTwoHopNeigh->twoHopNeighborAddr == twoHopNeigh->twoHopNeighborAddr
&& otherTwoHopNeigh->neighborMainAddr != twoHopNeigh->neighborMainAddr)
{
if (onlyNeighbor == N.end ())
{
onlyNeighbor = neighbor;
}
else
{
onlyNeighbor = N.end ();
break;
}
onlyOne = false;
break;
}
}
if (onlyNeighbor != N.end ())
if (onlyOne)
{
mprSet.insert (onlyNeighbor->neighborMainAddr);
coveredTwoHopNeighbors.insert (twoHopNeigh->twoHopNeighborAddr);
NS_LOG_LOGIC ("Neighbor " << twoHopNeigh->neighborMainAddr
<< " is the only that can reach 2-hop neigh. "
<< twoHopNeigh->twoHopNeighborAddr
<< " => select as MPR.");
mprSet.insert (twoHopNeigh->neighborMainAddr);
// take note of all the 2-hop neighbors reachable by the newly elected MPR
for (TwoHopNeighborSet::const_iterator otherTwoHopNeigh = N2.begin ();
otherTwoHopNeigh != N2.end (); otherTwoHopNeigh++)
{
if (otherTwoHopNeigh->neighborMainAddr == twoHopNeigh->neighborMainAddr)
{
coveredTwoHopNeighbors.insert (otherTwoHopNeigh->twoHopNeighborAddr);
}
}
}
}
// Remove the nodes from N2 which are now covered by a node in the MPR set.
@@ -616,6 +639,7 @@ RoutingProtocol::MprComputation()
{
if (coveredTwoHopNeighbors.find (twoHopNeigh->twoHopNeighborAddr) != coveredTwoHopNeighbors.end ())
{
NS_LOG_LOGIC ("2-hop neigh. " << twoHopNeigh->twoHopNeighborAddr << " is already covered by an MPR.");
twoHopNeigh = N2.erase (twoHopNeigh);
}
else
@@ -628,6 +652,26 @@ RoutingProtocol::MprComputation()
// least one node in the MPR set:
while (N2.begin () != N2.end ())
{
#ifdef NS3_LOG_ENABLE
{
std::ostringstream os;
os << "[";
for (TwoHopNeighborSet::const_iterator iter = N2.begin ();
iter != N2.end (); iter++)
{
TwoHopNeighborSet::const_iterator next = iter;
next++;
os << iter->neighborMainAddr << "->" << iter->twoHopNeighborAddr;
if (next != N2.end ())
os << ", ";
}
os << "]";
NS_LOG_DEBUG ("Step 4 iteration: N2=" << os.str ());
}
#endif //NS3_LOG_ENABLE
// 4.1. For each node in N, calculate the reachability, i.e., the
// number of nodes in N2 which are not yet covered by at
// least one node in the MPR set, and which are reachable