From 2eb811f9f140bf7e4442ee20f36e741a3b7424fa Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 30 Dec 2010 11:16:35 -0800
Subject: [PATCH] fix TcpSocketBase::RecvFrom()

---
 src/internet-stack/tcp-socket-base.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/internet-stack/tcp-socket-base.cc b/src/internet-stack/tcp-socket-base.cc
index f6d2af221..c767fce5e 100644
--- a/src/internet-stack/tcp-socket-base.cc
+++ b/src/internet-stack/tcp-socket-base.cc
@@ -412,7 +412,11 @@ TcpSocketBase::RecvFrom (uint32_t maxSize, uint32_t flags, Address &fromAddress)
   // Null packet means no data to read, and an empty packet indicates EOF
   if (packet != 0 && packet->GetSize () != 0)
     {
-      GetSockName (fromAddress);
+      SocketAddressTag tag;
+      bool found;
+      found = packet->PeekPacketTag (tag);
+      NS_ASSERT (found);
+      fromAddress = tag.GetAddress ();
     }
   return packet;
 }