From 2adaf7d53ebd8bc99bff3ee156617ffa7f66f497 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Fri, 15 Jan 2016 18:36:11 +0100 Subject: [PATCH] Bug 2254 - Ipv[4,6]RawSocket can return the wrong number of bytes sent - revert some changes for Linux compatibility. --- src/internet/model/ipv4-raw-socket-impl.cc | 1 + src/internet/test/ipv4-header-test.cc | 2 +- src/internet/test/ipv4-raw-test.cc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/internet/model/ipv4-raw-socket-impl.cc b/src/internet/model/ipv4-raw-socket-impl.cc index ec098741c..362f03f8b 100644 --- a/src/internet/model/ipv4-raw-socket-impl.cc +++ b/src/internet/model/ipv4-raw-socket-impl.cc @@ -244,6 +244,7 @@ Ipv4RawSocketImpl::SendTo (Ptr p, uint32_t flags, } else { + pktSize += header.GetSerializedSize (); ipv4->SendWithHeader (p, header, route); } NotifyDataSent (pktSize); diff --git a/src/internet/test/ipv4-header-test.cc b/src/internet/test/ipv4-header-test.cc index 5dfa9597b..064e18f81 100644 --- a/src/internet/test/ipv4-header-test.cc +++ b/src/internet/test/ipv4-header-test.cc @@ -128,7 +128,7 @@ Ipv4HeaderTest::DoSendData_IpHdr_Dscp (Ptr 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)); } diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc index 359fca62d..cbbaad322 100644 --- a/src/internet/test/ipv4-raw-test.cc +++ b/src/internet/test/ipv4-raw-test.cc @@ -140,7 +140,7 @@ Ipv4RawSocketImplTest::DoSendData_IpHdr (Ptr 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)); }