From ba17f6168e126eb547adb33591bb0fa03b299d3f Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Tue, 9 Jun 2015 23:36:57 +0200
Subject: [PATCH] Bug 1929 - TcpL4Protocol::Send must indicate the source
 address to routing (if known)

---
 RELEASE_NOTES                         | 1 +
 src/internet/model/tcp-l4-protocol.cc | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 9c0245baa..f5972dd05 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -25,6 +25,7 @@ New user-visible features
 Bugs fixed
 ----------
 - Bug 1736 - default dot11EDCATableMSDULifetime
+- Bug 1929 - TcpL4Protocol::Send must indicate the source address to routing (if known)
 - Bug 2126 - LrWpanNetDevice silently accepts no mobility on the node
 - Bug 2135 - TCP doesn't honor the socket's output interface
 - Bug 2136 - The usage of tid in wifi and wave module shall be "if (tid > 7)" rather than "if (tid >= 7)"
diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc
index 0e90ad149..e0ef3b120 100644
--- a/src/internet/model/tcp-l4-protocol.cc
+++ b/src/internet/model/tcp-l4-protocol.cc
@@ -537,6 +537,7 @@ TcpL4Protocol::Send (Ptr<Packet> packet,
   if (ipv4 != 0)
     {
       Ipv4Header header;
+      header.SetSource (saddr);
       header.SetDestination (daddr);
       header.SetProtocol (PROT_NUMBER);
       Socket::SocketErrno errno_;
@@ -580,6 +581,7 @@ TcpL4Protocol::Send (Ptr<Packet> packet,
   if (ipv6 != 0)
     {
       Ipv6Header header;
+      header.SetSourceAddress (saddr);
       header.SetDestinationAddress (daddr);
       header.SetNextHeader (PROT_NUMBER);
       Socket::SocketErrno errno_;