From b04062ce0810600e87e9f9ba6bcf175fbdbdf7b0 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Sat, 14 Mar 2015 18:45:02 +0100 Subject: [PATCH] Bug 2077 - Icmpv6L4Protocol::HandleDestinationUnreachable must check the packet size, not its serialized size --- RELEASE_NOTES | 1 + src/internet/model/icmpv6-l4-protocol.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 6d59d21f4..b9d4650a9 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -30,6 +30,7 @@ Bugs fixed - Bug 1974 - CalculateTxTime should return a Time, not a double - Bug 2070 - Wrong report of Packets and Bytes stored in CoDeL - Bug 2073 - NDisc cache entries update timer might be stuck in a loop +- Bug 2077 - Icmpv6L4Protocol::HandleDestinationUnreachable must check the packet size, not its serialized size Known issues ------------ diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc index 524e17e46..ebf6346b8 100644 --- a/src/internet/model/icmpv6-l4-protocol.cc +++ b/src/internet/model/icmpv6-l4-protocol.cc @@ -817,7 +817,7 @@ void Icmpv6L4Protocol::HandleDestinationUnreachable (Ptr p, Ipv6Address Ptr origPkt = unreach.GetPacket (); Ipv6Header ipHeader; - if ( origPkt->GetSerializedSize () > ipHeader.GetSerializedSize () ) + if ( origPkt->GetSize () > ipHeader.GetSerializedSize () ) { origPkt->RemoveHeader (ipHeader); uint8_t payload[8];