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

fix merge issues

Browse Source
This commit is contained in:
Tom Henderson
2009-04-17 15:10:23 -07:00
parent bd5cf9cb07
commit 12f755079e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2591,7 +2591,7 @@ RoutingProtocol::RequestRoute (uint32_t ifIndex,
}
bool
RoutingProtocol::RequestIfIndex (Ipv4Address destination,
RoutingProtocol::RequestInterface (Ipv4Address destination,
uint32_t& ifIndex)
{
RoutingTableEntry entry1, entry2;
@@ -2653,10 +2653,13 @@ RoutingProtocol::AddEntry (Ipv4Address const &dest,
RoutingTableEntry entry;
for (uint32_t i = 0; i < m_ipv4->GetNInterfaces (); i++)
{
if (m_ipv4->GetAddress (i) == interfaceAddress)
for (uint32_t j = 0; j < m_ipv4->GetNAddresses (i); j++)
{
AddEntry (dest, next, i, distance);
return;
if (m_ipv4->GetAddress (i,j).GetLocal () == interfaceAddress)
{
AddEntry (dest, next, i, distance);
return;
}
}
}
NS_ASSERT (false); // should not be reached

2
src/routing/olsr/olsr-routing-protocol.h
View File

@@ -125,7 +125,7 @@ private:
const Ipv4Header &ipHeader,
Ptr<Packet> packet,
RouteReplyCallback routeReply);
virtual bool RequestIfIndex (Ipv4Address destination,
virtual bool RequestInterface (Ipv4Address destination,
uint32_t& ifIndex);