From 12f755079e58c8d2c9d49931a1741708ff9b2fad Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Fri, 17 Apr 2009 15:10:23 -0700
Subject: [PATCH] fix merge issues

---
 src/routing/olsr/olsr-routing-protocol.cc | 11 +++++++----
 src/routing/olsr/olsr-routing-protocol.h  |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/routing/olsr/olsr-routing-protocol.cc b/src/routing/olsr/olsr-routing-protocol.cc
index 02b70c78e..f7625072c 100644
--- a/src/routing/olsr/olsr-routing-protocol.cc
+++ b/src/routing/olsr/olsr-routing-protocol.cc
@@ -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
diff --git a/src/routing/olsr/olsr-routing-protocol.h b/src/routing/olsr/olsr-routing-protocol.h
index cf7a606d1..0cf742789 100644
--- a/src/routing/olsr/olsr-routing-protocol.h
+++ b/src/routing/olsr/olsr-routing-protocol.h
@@ -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);