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

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 21eb92ad15..bd9a5586f6 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
@@ -13,11 +13,10 @@
 
 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;
@@ -59,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);
@@ -122,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);
@@ -138,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);
@@ -153,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);
@@ -167,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);
@@ -175,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));
@@ -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;
@@ -225,7 +225,7 @@ static char* transformIpv4Address (Ipv4Address from){
 		return bprintf("%s",s.c_str());
 }
 
-void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
+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)
 {
@@ -234,7 +234,6 @@ void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
 		LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
 	}
 
-
 	MyPointToPointHelper pointToPoint;
 
 	NetDeviceContainer netA;
@@ -274,7 +273,7 @@ void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
 	}
 }
 
-void * ns3_end_platform(void)
+void ns3_end_platform(void)
 {
 	XBT_DEBUG("InitializeRoutes");
 	GlobalRouteManager::BuildGlobalRoutingDatabase();