X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a279c221114b93985c6aa249e71cc4141082b310..3c89e084af54896c9dcd71ab064bbfc08dfffb64:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index b133fb89bf..403e1a5814 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -1,7 +1,9 @@ -/* Copyright (c) 2007-2013. The SimGrid Team. - * - * This program is free software; you can redistribute it and/or modify it +/* Copyright (c) 2007-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "network_ns3.hpp" #include "surf_private.h" #include "simgrid/sg_config.h" @@ -55,7 +57,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free); - NetworkLinkPtr net_link = surf_network_model->createResource(link->id, + NetworkLinkPtr net_link = surf_network_model->createNetworkLink(link->id, link->bandwidth, link->bandwidth_trace, link->latency, @@ -292,7 +294,7 @@ NetworkNS3Model::~NetworkNS3Model() { xbt_dict_free(&dict_socket); } -NetworkLinkPtr NetworkNS3Model::createResource(const char *name, +NetworkLinkPtr NetworkNS3Model::createNetworkLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial,