From 3b4e3ba53d8bad8d6ea7c1b18406fb0a80a2a991 Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Wed, 20 Apr 2016 00:18:21 +0200 Subject: [PATCH] internet: (fixes #2377) SocketIpTosTag and SocketIpv6TclassTag may be added twice in UDP --- RELEASE_NOTES | 1 + src/internet/model/udp-socket-impl.cc | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index f3e466d9f..fc1992aa4 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -35,6 +35,7 @@ Bugs fixed - Bug 2333 - TCP Scalable implementation - Bug 2347 - LrWpan Ascii traces are hooked to the wrong traces. - Bug 2353 - TCP Vegas implementation +- Bug 2377 - SocketIpTosTag and SocketIpv6TclassTag may be added twice in UDP Known issues ------------ diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index e424b2cf9..33d24042f 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -812,13 +812,6 @@ UdpSocketImpl::SendTo (Ptr p, uint32_t flags, const Address &address) NS_LOG_FUNCTION (this << p << flags << address); if (InetSocketAddress::IsMatchingType (address)) { - if (IsManualIpTos ()) - { - SocketIpTosTag ipTosTag; - ipTosTag.SetTos (GetIpTos ()); - p->AddPacketTag (ipTosTag); - } - InetSocketAddress transport = InetSocketAddress::ConvertFrom (address); Ipv4Address ipv4 = transport.GetIpv4 (); uint16_t port = transport.GetPort (); @@ -826,13 +819,6 @@ UdpSocketImpl::SendTo (Ptr p, uint32_t flags, const Address &address) } else if (Inet6SocketAddress::IsMatchingType (address)) { - if (IsManualIpv6Tclass ()) - { - SocketIpv6TclassTag ipTclassTag; - ipTclassTag.SetTclass (GetIpv6Tclass ()); - p->AddPacketTag (ipTclassTag); - } - Inet6SocketAddress transport = Inet6SocketAddress::ConvertFrom (address); Ipv6Address ipv6 = transport.GetIpv6 (); uint16_t port = transport.GetPort ();