From b68cfde5b450bba58d6716403b6603c467f33e95 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Wed, 3 Feb 2016 21:37:41 +0100
Subject: [PATCH] network: (fixes #2266) NixRouting info are not copied during
 a packet fragmentation.

---
 RELEASE_NOTES                                           | 1 +
 src/network/model/packet.cc                             | 4 +++-
 src/nix-vector-routing/model/ipv4-nix-vector-routing.cc | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index c4394e418..b70eabe8c 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -88,6 +88,7 @@ Bugs fixed
 - Bug 2258 - TcpSocketBase updated options and RTT for out of range segments.
 - Bug 2259 - GSL not successfully enabled for Wi-Fi DSSS error rate model
 - Bug 2262 - Corrected initial slow start threshold value
+- Bug 2266 - NixRouting info are not copied during a packet fragmentation.
 - Bug 2267 - Wrong channel bandwidth value in pcap files
 - Bug 2272 - SixLowPan NetDevice can not send uncompressed packets larger than 802.15.4 MTU
 - Bug 2286 - Support for SLL header (de)serialization.
diff --git a/src/network/model/packet.cc b/src/network/model/packet.cc
index dc45eba26..51ed315ff 100644
--- a/src/network/model/packet.cc
+++ b/src/network/model/packet.cc
@@ -236,7 +236,9 @@ Packet::CreateFragment (uint32_t start, uint32_t length) const
   PacketMetadata metadata = m_metadata.CreateFragment (start, end);
   // again, call the constructor directly rather than
   // through Create because it is private.
-  return Ptr<Packet> (new Packet (buffer, byteTagList, m_packetTagList, metadata), false);
+  Ptr<Packet> ret = Ptr<Packet> (new Packet (buffer, byteTagList, m_packetTagList, metadata), false);
+  ret->SetNixVector (GetNixVector ());
+  return ret;
 }
 
 void
diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
index 9d9fd1ce8..048cf59d2 100644
--- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
+++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
@@ -143,7 +143,7 @@ Ipv4NixVectorRouting::GetNixVector (Ptr<Node> source, Ipv4Address dest, Ptr<NetD
   /// Do not process packets to self (see \bugid{1308})
   if (source == destNode)
     {
-      NS_LOG_DEBUG ("Do not processs packets to self");
+      NS_LOG_DEBUG ("Do not process packets to self");
       return 0;
     }
   else