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

Bug 1318 - Asserts for IPv6 malformed packets

Browse Source
This commit is contained in:
Tommaso Pecorella
2012-01-09 18:48:14 +01:00
parent 29f61afff6
commit eecb030ae9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -957,6 +957,8 @@ void Ipv6L3Protocol::LocalDeliver (Ptr<const Packet> packet, Ipv6Header const& i
p->CopyData (buf, sizeof(buf));
nextHeader = buf[0];
nextHeaderPosition = buf[1];
NS_ASSERT_MSG (nextHeader != Ipv6Header::IPV6_EXT_HOP_BY_HOP, "Double Ipv6Header::IPV6_EXT_HOP_BY_HOP in packet, aborting");
NS_ASSERT_MSG (nextHeaderPosition != 0, "Zero-size IPv6 Option Header, aborting");
}
/* process all the extensions found and the layer 4 protocol */
@@ -966,7 +968,11 @@ void Ipv6L3Protocol::LocalDeliver (Ptr<const Packet> packet, Ipv6Header const& i
if (ipv6Extension)
{
nextHeaderPosition += ipv6Extension->Process (p, nextHeaderPosition, ip, dst, &nextHeader, isDropped);
uint8_t nextHeaderStep = 0;
nextHeaderStep = ipv6Extension->Process (p, nextHeaderPosition, ip, dst, &nextHeader, isDropped);
nextHeaderPosition += nextHeaderStep;
NS_ASSERT_MSG (nextHeaderStep != 0, "Zero-size IPv6 Option Header, aborting");
if (isDropped)
{