first round of cleanups in the NS3 network

[simgrid.git] / src / surf / ns3 / ns3_interface.cc

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 900f77b..4507c9d 100644 (file)
--- 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;
@@ -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);
@@ -228,7 +227,7 @@ static char* transformIpv4Address (Ipv4Address from){
 
 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);