From edc72059a4271e345da8c92ebcf8a52664fc224a Mon Sep 17 00:00:00 2001 From: Alfonso Oliveira Date: Fri, 7 Sep 2018 23:57:41 +0200 Subject: [PATCH] internet: (fixes #2990) Ipv6 packet shouldn't be marked with SocketIpTtlTag --- src/internet/model/icmpv6-l4-protocol.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc index a7154f6d4..0b8fa0274 100644 --- a/src/internet/model/icmpv6-l4-protocol.cc +++ b/src/internet/model/icmpv6-l4-protocol.cc @@ -900,10 +900,10 @@ void Icmpv6L4Protocol::SendMessage (Ptr packet, Ipv6Address src, Ipv6Add { NS_LOG_FUNCTION (this << packet << src << dst << (uint32_t)ttl); Ptr ipv6 = m_node->GetObject (); - SocketIpTtlTag tag; + SocketIpv6HopLimitTag tag; NS_ASSERT (ipv6 != 0); - tag.SetTtl (ttl); + tag.SetHopLimit (ttl); packet->AddPacketTag (tag); m_downTarget (packet, src, dst, PROT_NUMBER, 0); } @@ -920,7 +920,7 @@ void Icmpv6L4Protocol::SendMessage (Ptr packet, Ipv6Address dst, Icmpv6H Ptr ipv6 = m_node->GetObject (); NS_ASSERT (ipv6 != 0 && ipv6->GetRoutingProtocol () != 0); Ipv6Header header; - SocketIpTtlTag tag; + SocketIpv6HopLimitTag tag; Socket::SocketErrno err; Ptr route; Ptr oif (0); //specify non-zero if bound to a source address @@ -931,7 +931,7 @@ void Icmpv6L4Protocol::SendMessage (Ptr packet, Ipv6Address dst, Icmpv6H if (route != 0) { NS_LOG_LOGIC ("Route exists"); - tag.SetTtl (ttl); + tag.SetHopLimit (ttl); packet->AddPacketTag (tag); Ipv6Address src = route->GetSource ();