diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 82819c2bb..c25893588 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -47,6 +47,7 @@ Bugs fixed - Bug 1853 - NS_LOG_FUNCTION broken on OSX 10.9 - Bug 1855 - SixLowPanNetDevice is not correctly indexed - Bug 1862 - NS_LOG="Time=*|prefix_time" causes stack overflow +- Bug 1874 - Ipv4L3Protocol::ProcessFragment: addressCombination and idProto identifiers not properly computed Release 3.19 ============= diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index 90caa0ba9..13a3a3a66 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -1290,8 +1290,8 @@ Ipv4L3Protocol::ProcessFragment (Ptr& packet, Ipv4Header& ipHeader, uint { NS_LOG_FUNCTION (this << packet << ipHeader << iif); - uint64_t addressCombination = uint64_t (ipHeader.GetSource ().Get ()) << 32 & uint64_t (ipHeader.GetDestination ().Get ()); - uint32_t idProto = uint32_t (ipHeader.GetIdentification ()) << 16 & uint32_t (ipHeader.GetProtocol ()); + uint64_t addressCombination = uint64_t (ipHeader.GetSource ().Get ()) << 32 | uint64_t (ipHeader.GetDestination ().Get ()); + uint32_t idProto = uint32_t (ipHeader.GetIdentification ()) << 16 | uint32_t (ipHeader.GetProtocol ()); std::pair key; bool ret = false; Ptr p = packet->Copy ();