From e9db1c6bd915c76435648987526e3135cb91285f Mon Sep 17 00:00:00 2001 From: Navarrop Date: Mon, 12 Sep 2011 14:55:58 +0200 Subject: [PATCH 1/1] Use default config value for MTU. --- src/surf/ns3/ns3_interface.cc | 2 +- src/surf/ns3/ns3_simulator.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc index fce98bcf26..10d8d6b2e0 100644 --- a/src/surf/ns3/ns3_interface.cc +++ b/src/surf/ns3/ns3_interface.cc @@ -100,7 +100,7 @@ int ns3_initialize(const char* TcpProtocol){ // "ns3::TcpReno" // "ns3::TcpTahoe" - Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000)); // 1000-byte packet for easier reading + Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1024)); // 1024-byte packet for easier reading Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1)); if(!strcmp(TcpProtocol,"default")){ diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index af1359b88f..07abf0cfda 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -117,8 +117,7 @@ static void send_callback(Ptr localSocket, uint32_t txSpace){ return; } - uint32_t packetSize = 1024; - uint32_t toWrite = min (mysocket->remaining, packetSize); + uint32_t toWrite = min (mysocket->remaining, txSpace); uint8_t *data = (uint8_t*)malloc(sizeof(uint8_t)*toWrite); int amountSent = localSocket->Send (&data[0], toWrite, 0); free (data); -- 2.20.1