X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ee06836f97375c683e9e31d24ff77fb258b453b..36d71e3707463a389153fbf9cebd68ce4a5276a1:/src/surf/ns3/ns3_interface.cc

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 03ddec0d8e..0640c954f0 100644
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -10,14 +10,6 @@
 #include "xbt/log.h"
 #include "xbt/dynar.h"
 
-#include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
-#include "ns3/node-module.h"
-#include "ns3/helper-module.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/ipv4-global-routing-helper.h"
-
 using namespace ns3;
 
 extern xbt_lib_t host_lib;
@@ -55,11 +47,14 @@ double ns3_get_socket_remains(void *socket){
 		return ns3_sim->get_remains_from_socket(socket);
 }
 
+double ns3_get_socket_sent(void *socket){
+  return ns3_sim->get_sent_from_socket(socket);
+}
+
 char ns3_get_socket_is_finished(void *socket){
 		return ns3_sim->get_finished(socket);
 }
 
-
 double ns3_time(){
 	return Simulator::Now().GetSeconds();
 }
@@ -97,10 +92,38 @@ int ns3_finalize(void){
 }
 
 // initialize the NS3 interface and environment
-int ns3_initialize(void){
+int ns3_initialize(const char* TcpProtocol){
   xbt_assert(!ns3_sim, "ns3 already initialized");
   ns3_sim = new NS3Sim();
-  return 0;
+
+//  tcpModel are:
+//  "ns3::TcpNewReno"
+//  "ns3::TcpReno"
+//  "ns3::TcpTahoe"
+
+  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000)); // 1000-byte packet for easier reading
+  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
+
+  if(!strcmp(TcpProtocol,"default")){
+	  return 0;
+  }
+  if(!strcmp(TcpProtocol,"Reno")){
+	  XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+	  Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue("ns3::TcpReno"));
+	  return 0;
+  }
+  if(!strcmp(TcpProtocol,"NewReno")){
+	  XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+	  Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue("ns3::TcpNewReno"));
+	  return 0;
+  }
+  if(!strcmp(TcpProtocol,"Tahoe")){
+	  XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+	  Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue("ns3::TcpTahoe"));
+	  return 0;
+  }
+
+  XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
 }
 
 void * ns3_add_host(char * id)