X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcdbc53f2291d5ef450d6ff07ab25c25670c3527..1fd664b43fb86c61c7f394c6d23de727cee5bc46:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 8a583d12ca..3064e7dc78 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -17,7 +17,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3); int NS3_EXTENSION_ID; -xbt_dynar_t IPV4addr; +xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free); static double time_to_next_flow_completion = -1; extern xbt_dict_t dict_socket; @@ -37,11 +37,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) { XBT_DEBUG("NS3_ADD_LINK '%s'",link->id); - if(!IPV4addr) - IPV4addr = xbt_dynar_new(sizeof(char*),free); - - Link *l = surf_network_model->createLink(link->id, link->bandwidth, link->latency, - link->policy, link->properties); + Link *l = surf_network_model->createLink(link->id, link->bandwidth, link->latency, link->policy, link->properties); if (link->bandwidth_trace) l->setBandwidthTrace(link->latency_trace); if (link->latency_trace) @@ -210,7 +206,7 @@ static void define_callbacks_ns3(void) { simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host); simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router); - simgrid::surf::on_link.connect (&parse_ns3_add_link); + simgrid::surf::on_link.connect (parse_ns3_add_link); simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster); simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS); simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes