--- a/src/routing/olsr/olsr-agent-impl.cc	Mon Jun 09 06:40:21 2008 -0700
+++ b/src/routing/olsr/olsr-agent-impl.cc	Mon Jun 09 07:01:12 2008 -0700
@@ -303,13 +303,8 @@
 AgentImpl::RecvOlsr (Ptr<Socket> socket)
 {
   Ptr<Packet> receivedPacket;
-  receivedPacket = socket->Recv ();
-
-  SocketAddressTag tag;
-  bool found;
-  found = receivedPacket->FindFirstMatchingTag (tag);
-  NS_ASSERT (found);
-  Address sourceAddress = tag.GetAddress ();
+  Address sourceAddress;
+  receivedPacket = socket->RecvFrom (sourceAddress);
 
   InetSocketAddress inetSourceAddr = InetSocketAddress::ConvertFrom (sourceAddress);
   Ipv4Address senderIfaceAddr = inetSourceAddr.GetIpv4 ();