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

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 4c3d591560..8a0055a9f3 100644
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -9,15 +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;
@@ -38,29 +37,25 @@ void ns3_simulator(double min){
 }
 
 void* ns3_get_socket_action(void *socket){
-		return ns3_sim->get_action_from_socket(socket);
+  return ((MySocket *)socket)->action;
 }
 
 double ns3_get_socket_remains(void *socket){
-		return ns3_sim->get_remains_from_socket(socket);
+  return ((MySocket *)socket)->remaining;
 }
 
 double ns3_get_socket_sent(void *socket){
-  return ns3_sim->get_sent_from_socket(socket);
+  return ((MySocket *)socket)->sentBytes;
 }
 
 char ns3_get_socket_is_finished(void *socket){
-		return ns3_sim->get_finished(socket);
-}
-
-double ns3_time(){
-	return Simulator::Now().GetSeconds();
+  return ((MySocket *)socket)->finished;
 }
 
 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_node_t node1 = ns3_find_host(a);
+	ns3_node_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,11 +117,12 @@ int ns3_initialize(const char* TcpProtocol){
   }
 
   XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
+  return 0;
 }
 
 void * ns3_add_host(const char * id)
 {
-	ns3_nodes_t host  = xbt_new0(s_ns3_nodes_t,1);
+	ns3_node_t host  = xbt_new0(s_ns3_node_t,1);
 	XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
 	Ptr<Node> node =  CreateObject<Node> (0);
 	stack.Install(node);
@@ -140,7 +136,7 @@ void * ns3_add_host(const char * id)
 
 void * ns3_add_host_cluster(const char * id)
 {
-	ns3_nodes_t host  = xbt_new0(s_ns3_nodes_t,1);
+	ns3_node_t host  = xbt_new0(s_ns3_node_t,1);
 	XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
 	Ptr<Node> node =  CreateObject<Node> (0);
 	stack.Install(node);
@@ -155,7 +151,7 @@ void * ns3_add_host_cluster(const char * id)
 
 void * ns3_add_router(const char * id)
 {
-	ns3_nodes_t router  = xbt_new0(s_ns3_nodes_t,1);
+	ns3_node_t router  = xbt_new0(s_ns3_node_t,1);
 	XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id);
 	Ptr<Node> node =  CreateObject<Node> (0);
 	stack.Install(node);
@@ -167,7 +163,7 @@ void * ns3_add_router(const char * id)
 	return router;
 }
 
-void * ns3_add_cluster(char * bw,char * lat,const char *id)
+void ns3_add_cluster(char * bw,char * lat,const char *id)
 {
 
 	XBT_DEBUG("cluster_id: %s",id);
@@ -175,7 +171,7 @@ void * ns3_add_cluster(char * bw,char * lat,const 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));
@@ -225,9 +221,9 @@ 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)
+					char *bw, char *lat)
 {
 	if(number_of_links == 1 ) {
 		LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO);
@@ -273,7 +269,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();