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

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 57f118bc3c..fce98bcf26 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;
@@ -43,8 +35,7 @@ int port_number = 1025; //Port number is limited from 1025 to 65 000
 static NS3Sim* ns3_sim = 0;
 
 void ns3_simulator(double min){
-			ns3_sim->simulator_stop(min);
-			ns3_sim->simulator_start();
+			ns3_sim->simulator_start(min);
 }
 
 void* ns3_get_socket_action(void *socket){
@@ -100,10 +91,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)
@@ -235,13 +254,13 @@ void * ns3_add_link(int src,int dst,char * bw,char * lat)
 	free(adr);
 	interfaces.Add(address.Assign (netA));
 
-	XBT_DEBUG("Have write '%s' for Node '%d'",transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2)),src);
-	xbt_dynar_set(IPV4addr,src,
-			transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2)));
+	char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2));
+	XBT_DEBUG("Have write '%s' for Node '%d'",tmp,src);
+	xbt_dynar_set(IPV4addr,src,tmp);
 
-	XBT_DEBUG("Have write '%s' for Node '%d'",transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1)),dst);
-	xbt_dynar_set(IPV4addr,dst,
-			transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1)));
+	tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1));
+	XBT_DEBUG("Have write '%s' for Node '%d'",tmp,dst);
+	xbt_dynar_set(IPV4addr,dst,tmp);
 
 	if(number_of_links == 255){
 		if(number_of_networks == 255)