X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/617f1dfa78a7a139b7a7d6262c2b55e42e259e44..f13ab1807d381f0bf36027a9042e046dc4735dd5:/src/surf/network_ns3.c diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c index 595dfc5da3..31b26d5a81 100644 --- a/src/surf/network_ns3.c +++ b/src/surf/network_ns3.c @@ -283,8 +283,8 @@ void create_ns3_topology() if( strcmp(src,dst) && ((surf_ns3_link_t)link)->created){ XBT_DEBUG("Route from '%s' to '%s' with link '%s'",src,dst,((surf_ns3_link_t)link)->data->id); - char * link_bdw = bprintf("%s",((surf_ns3_link_t)link)->data->bdw); - char * link_lat = bprintf("%s",(((surf_ns3_link_t)link)->data->lat)); + char * link_bdw = xbt_strdup(((surf_ns3_link_t)link)->data->bdw); + char * link_lat = xbt_strdup(((surf_ns3_link_t)link)->data->lat); replace_lat_ns3(&link_lat); replace_bdw_ns3(&link_bdw); ((surf_ns3_link_t)link)->created = 0; @@ -312,7 +312,7 @@ void create_ns3_topology() } } -static void define_callbacks_ns3(const char *filename) +static void define_callbacks_ns3(void) { surfxml_add_callback(STag_surfxml_host_cb_list, &parse_ns3_add_host); //HOST surfxml_add_callback(STag_surfxml_router_cb_list, &parse_ns3_add_router); //ROUTER @@ -357,7 +357,7 @@ static void ns3_action_set_category(surf_action_t action, const char *category) } #endif -void surf_network_model_init_NS3(const char *filename) +void surf_network_model_init_NS3() { if (surf_network_model) return; @@ -389,7 +389,7 @@ void surf_network_model_init_NS3(const char *filename) } routing_model_create(sizeof(s_surf_ns3_link_t), NULL, NULL); - define_callbacks_ns3(filename); + define_callbacks_ns3(); NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host); NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib,(void_f_pvoid_t)free_ns3_host);