X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a..084e76d536977bc9b57d9e7c01aa9feb41551fd0:/src/surf/ns3/ns3_interface.cc diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc index 0b9b1a3d10..3b516ff07f 100644 --- a/src/surf/ns3/ns3_interface.cc +++ b/src/surf/ns3/ns3_interface.cc @@ -9,12 +9,11 @@ #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(ns3, surf, @@ -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 src_node = nodes.Get(node1->node_num); Ptr dst_node = nodes.Get(node2->node_num);