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

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index a748ce32d9..4507c9d811 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
@@ -9,14 +9,14 @@
 #include "xbt/lib.h"
 #include "xbt/log.h"
 #include "xbt/dynar.h"
+#include "xbt/Extendable.hpp"
+
 
 using namespace ns3;
 
-extern xbt_lib_t host_lib;
-extern int NS3_HOST_LEVEL;		//host node for ns3
 extern xbt_dynar_t IPV4addr;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(interface_ns3, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf,
                                 "Logging specific to the SURF network NS3 module");
 
 InternetStackHelper stack;
@@ -24,8 +24,6 @@ NodeContainer nodes;
 NodeContainer Cluster_nodes;
 Ipv4InterfaceContainer interfaces;
 
-
-
 int number_of_nodes = 0;
 int number_of_clusters_nodes = 0;
 int number_of_links = 1;
@@ -60,8 +58,8 @@ double ns3_time(){
 
 int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,void * action)
 {
-	ns3_nodes_t node1 = (ns3_nodes_t) xbt_lib_get_or_null(host_lib,a,NS3_HOST_LEVEL);
-	ns3_nodes_t node2 = (ns3_nodes_t) xbt_lib_get_or_null(host_lib,b,NS3_HOST_LEVEL);
+	ns3_nodes_t node1 = ns3_find_host(a);
+	ns3_nodes_t node2 = ns3_find_host(b);
 
 	Ptr<Node> src_node = nodes.Get(node1->node_num);
 	Ptr<Node> dst_node = nodes.Get(node2->node_num);
@@ -123,9 +121,10 @@ int ns3_initialize(const char* TcpProtocol){
   }
 
   XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
+  return 0;
 }
 
-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);
@@ -139,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);
@@ -154,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);
@@ -168,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);
@@ -176,7 +175,7 @@ void * ns3_add_cluster(char * bw,char * lat,char *id)
 	XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes);
 
 	NodeContainer Nodes;
-	int i;
+	unsigned int i;
 
 	for(i = number_of_clusters_nodes; i < Cluster_nodes.GetN() ; i++){
 		Nodes.Add(Cluster_nodes.Get(i));
@@ -199,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){
@@ -212,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;
@@ -222,19 +222,20 @@ 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,int dst,char * bw,char * lat)
+void ns3_add_link(int src, e_ns3_network_element_type_t type_src,
+					int dst, e_ns3_network_element_type_t type_dst,
+					char *bw, char *lat)
 {
 	if(number_of_links == 1 ) {
 		LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO);
 		LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
 	}
 
-	PointToPointHelper pointToPoint;
+	MyPointToPointHelper pointToPoint;
+
 	NetDeviceContainer netA;
 	Ipv4AddressHelper address;
 
@@ -246,7 +247,7 @@ void * ns3_add_link(int src,int dst,char * bw,char * lat)
 	pointToPoint.SetChannelAttribute ("Delay", StringValue (lat));
 	//pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
 
-	netA.Add(pointToPoint.Install (a, b));
+	netA.Add(pointToPoint.Install (a, type_src, b, type_dst));
 
 	char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
 	address.SetBase (adr, "255.255.0.0");
@@ -272,7 +273,7 @@ void * ns3_add_link(int src,int dst,char * bw,char * lat)
 	}
 }
 
-void * ns3_end_platform(void)
+void ns3_end_platform(void)
 {
 	XBT_DEBUG("InitializeRoutes");
 	GlobalRouteManager::BuildGlobalRoutingDatabase();