From: Navarrop <Pierre.Navarro@imag.fr>
Date: Mon, 12 Sep 2011 12:55:58 +0000 (+0200)
Subject: Use default config value for MTU.
X-Git-Tag: v3_6_2~103
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e9db1c6bd915c76435648987526e3135cb91285f?ds=sidebyside

Use default config value for MTU.
---

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<Socket> 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);