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

Bug 2254 - Ipv[4,6]RawSocket can return the wrong number of bytes sent - revert some changes for Linux compatibility.

Browse Source
This commit is contained in:
Tommaso Pecorella
2016-01-15 18:36:11 +01:00
parent fcf0b6eb98
commit 2adaf7d53e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/internet/model/ipv4-raw-socket-impl.cc
View File

@@ -244,6 +244,7 @@ Ipv4RawSocketImpl::SendTo (Ptr<Packet> p, uint32_t flags,
}
else
{
pktSize += header.GetSerializedSize ();
ipv4->SendWithHeader (p, header, route);
}
NotifyDataSent (pktSize);

2
src/internet/test/ipv4-header-test.cc
View File

@@ -128,7 +128,7 @@ Ipv4HeaderTest::DoSendData_IpHdr_Dscp (Ptr<Socket> socket, std::string to, Ipv4H
p->AddHeader (ipHeader);
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (p, 0, realTo),
123, to);
143, to);
socket->SetAttribute ("IpHeaderInclude", BooleanValue (false));
}

2
src/internet/test/ipv4-raw-test.cc
View File

@@ -140,7 +140,7 @@ Ipv4RawSocketImplTest::DoSendData_IpHdr (Ptr<Socket> socket, std::string to)
p->AddHeader (ipHeader);
NS_TEST_EXPECT_MSG_EQ (socket->SendTo (p, 0, realTo),
123, to);
143, to);
socket->SetAttribute ("IpHeaderInclude", BooleanValue (false));
}