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

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 50d724cc3c..4c3d591560 100644
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -102,9 +102,6 @@ int ns3_initialize(const char* TcpProtocol){
   Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1024)); // 1024-byte packet for easier reading
   Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
 
-#ifdef _HAVE_NS3_RED
-  XBT_DEBUG("Using RED version of ns3");
-#endif
   if(!strcmp(TcpProtocol,"default")){
 	  return 0;
   }
@@ -127,7 +124,7 @@ int ns3_initialize(const char* TcpProtocol){
   XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
 }
 
-void * ns3_add_host(char * id)
+void * ns3_add_host(const char * id)
 {
 	ns3_nodes_t host  = xbt_new0(s_ns3_nodes_t,1);
 	XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
@@ -141,7 +138,7 @@ void * ns3_add_host(char * id)
 	return host;
 }
 
-void * ns3_add_host_cluster(char * id)
+void * ns3_add_host_cluster(const char * id)
 {
 	ns3_nodes_t host  = xbt_new0(s_ns3_nodes_t,1);
 	XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
@@ -156,7 +153,7 @@ void * ns3_add_host_cluster(char * id)
 	return host;
 }
 
-void * ns3_add_router(char * id)
+void * ns3_add_router(const char * id)
 {
 	ns3_nodes_t router  = xbt_new0(s_ns3_nodes_t,1);
 	XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id);
@@ -170,7 +167,7 @@ void * ns3_add_router(char * id)
 	return router;
 }
 
-void * ns3_add_cluster(char * bw,char * lat,char *id)
+void * ns3_add_cluster(char * bw,char * lat,const char *id)
 {
 
 	XBT_DEBUG("cluster_id: %s",id);
@@ -215,7 +212,7 @@ void * ns3_add_cluster(char * bw,char * lat,char *id)
 	XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
 }
 
-void * ns3_add_AS(char * id)
+void * ns3_add_AS(const char * id)
 {
 	XBT_DEBUG("Interface ns3 add AS '%s'",id);
 	return NULL;
@@ -237,11 +234,8 @@ void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
 		LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
 	}
 
-#ifdef _HAVE_NS3_RED
 	MyPointToPointHelper pointToPoint;
-#else
-	PointToPointHelper pointToPoint;
-#endif
+
 	NetDeviceContainer netA;
 	Ipv4AddressHelper address;
 
@@ -253,11 +247,7 @@ void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
 	pointToPoint.SetChannelAttribute ("Delay", StringValue (lat));
 	//pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
 
-#ifdef _HAVE_NS3_RED
 	netA.Add(pointToPoint.Install (a, type_src, b, type_dst));
-#else
-	netA.Add(pointToPoint.Install (a, b));
-#endif
 
 	char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
 	address.SetBase (adr, "255.255.0.0");