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

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index eed590cb9a..21eb92ad15 100644
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -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_INFO("Using RED version of ns3");
-#endif
   if(!strcmp(TcpProtocol,"default")){
 	  return 0;
   }
@@ -201,6 +198,7 @@ void * ns3_add_cluster(char * bw,char * lat,char *id)
 	XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr);
 	Ipv4AddressHelper ipv4;
 	ipv4.SetBase (adr, "255.255.0.0");
+	free(adr);
 	interfaces.Add(ipv4.Assign (devices));
 
 	if(number_of_links == 255){
@@ -224,9 +222,7 @@ static char* transformIpv4Address (Ipv4Address from){
 	std::stringstream sstream;
 		sstream << from ;
 		std::string s = sstream.str();
-		size_t size = s.size() + 1;
-		char* IPaddr = bprintf("%s",s.c_str());
-		return IPaddr;
+		return bprintf("%s",s.c_str());
 }
 
 void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
@@ -238,11 +234,9 @@ 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;
 
@@ -254,11 +248,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");