F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 1846 - IPv6 should send Destination Unreachable if no route is available

Browse Source
This commit is contained in:
Tommaso Pecorella
2014-01-26 18:19:03 +01:00
parent 3a447bbcc0
commit ffba6c64ee
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/internet/model/icmpv6-l4-protocol.cc
View File

@@ -272,11 +272,14 @@ void Icmpv6L4Protocol::Forward (Ipv6Address source, Icmpv6Header icmp,
uint8_t nextHeader = ipHeader.GetNextHeader ();
Ptr<IpL4Protocol> l4 = ipv6->GetProtocol (nextHeader);
if (l4 != 0)
if (nextHeader != Icmpv6L4Protocol::PROT_NUMBER)
{
l4->ReceiveIcmp (source, ipHeader.GetHopLimit (), icmp.GetType (), icmp.GetCode (),
info, ipHeader.GetSourceAddress (), ipHeader.GetDestinationAddress (), payload);
Ptr<IpL4Protocol> l4 = ipv6->GetProtocol (nextHeader);
if (l4 != 0)
{
l4->ReceiveIcmp (source, ipHeader.GetHopLimit (), icmp.GetType (), icmp.GetCode (),
info, ipHeader.GetSourceAddress (), ipHeader.GetDestinationAddress (), payload);
}
}
}

6
src/internet/model/ipv6-l3-protocol.cc
View File

@@ -869,6 +869,7 @@ void Ipv6L3Protocol::Receive (Ptr<NetDevice> device, Ptr<const Packet> p, uint16
MakeCallback (&Ipv6L3Protocol::RouteInputError, this)))
{
NS_LOG_WARN ("No route found for forwarding packet. Drop.");
GetIcmpv6 ()->SendErrorDestinationUnreachable (p->Copy (), hdr.GetSourceAddress (), Icmpv6Header::ICMPV6_NO_ROUTE);
m_dropTrace (hdr, packet, DROP_NO_ROUTE, m_node->GetObject<Ipv6> (), interface);
}
}
@@ -1027,9 +1028,8 @@ void Ipv6L3Protocol::IpForward (Ptr<const NetDevice> idev, Ptr<Ipv6Route> rtentr
{
NS_LOG_WARN ("TTL exceeded. Drop.");
m_dropTrace (ipHeader, packet, DROP_TTL_EXPIRED, m_node->GetObject<Ipv6> (), 0);
// Do not reply to ICMPv6 or to multicast IPv6 address
if (ipHeader.GetNextHeader () != Icmpv6L4Protocol::PROT_NUMBER
&& ipHeader.GetDestinationAddress ().IsMulticast () == false)
// Do not reply to multicast IPv6 address
if (ipHeader.GetDestinationAddress ().IsMulticast () == false)
{
packet->AddHeader (ipHeader);
GetIcmpv6 ()->SendErrorTimeExceeded (packet, ipHeader.GetSourceAddress (), Icmpv6Header::ICMPV6_HOPLIMIT);