port NS3 to the new signals in simgrid::Host

[simgrid.git] / src / surf / network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 163de0c..f637494 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -39,11 +39,11 @@ static void replace_lat_ns3(char ** lat)
   xbt_free(temp);
 }
 
-static void simgrid_ns3_add_host(simgrid::surf::Host* host)
+static void simgrid_ns3_add_host(simgrid::Host& host)
 {
-  const char* id = host->getName();
+  const char* id = host.getName().c_str();
   XBT_DEBUG("NS3_ADD_HOST '%s'", id);
-  host->getHost()->extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
+  host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
 }
 
 static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
@@ -57,7 +57,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
                                      link->bandwidth_trace,
                                      link->latency,
                                      link->latency_trace,
-                                     link->state,
+                                     link->initiallyOn,
                                      link->state_trace,
                                      link->policy,
                                      link->properties);
@@ -230,7 +230,7 @@ static void parse_ns3_end_platform(void)
 
 static void define_callbacks_ns3(void)
 {
-  simgrid::surf::Host::onCreation.connect(simgrid_ns3_add_host);
+  simgrid::Host::onCreation.connect(simgrid_ns3_add_host);
   simgrid::surf::routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router);
   sg_platf_link_add_cb (&parse_ns3_add_link);
   sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
@@ -288,7 +288,7 @@ Link* NetworkNS3Model::createLink(const char *name,
                                         tmgr_trace_t bw_trace,
                                         double lat_initial,
                                         tmgr_trace_t lat_trace,
-                                        e_surf_resource_state_t state_initial,
+                                        int initiallyOn,
                                         tmgr_trace_t state_trace,
                                         e_surf_link_sharing_policy_t policy,
                                         xbt_dict_t properties){