X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70f9cb513b1dae6350ae04b320ed64f662f29081..d7c7b116e5fd35a07a4a07893bf04d16435347e5:/src/surf/ns3/ns3_simulator.hpp diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp index a09388c1e7..a0c0c1140b 100644 --- a/src/surf/ns3/ns3_simulator.hpp +++ b/src/surf/ns3/ns3_simulator.hpp @@ -19,15 +19,12 @@ class XBT_PRIVATE NetPointNs3 { public: static simgrid::xbt::Extension EXTENSION_ID; - void set_name(std::string name) { name_ = name; } - explicit NetPointNs3(); - std::string name_; ns3::Ptr ns3_node_; std::string ipv4_address_; }; -XBT_PRIVATE void ns3_initialize(std::string TcpProtocol); +XBT_PRIVATE void ns3_initialize(const std::string& TcpProtocol); XBT_PRIVATE void ns3_simulator(double max_seconds); XBT_PRIVATE void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst, double bw, double lat, const std::string& link_name, @@ -57,7 +54,7 @@ static inline std::string transform_socket_ptr(ns3::Ptr local_socke class XBT_PRIVATE WifiZone { public: - WifiZone(std::string name_, simgrid::s4u::Host* host_, ns3::Ptr ap_node_, + WifiZone(const std::string& name_, simgrid::s4u::Host* host_, ns3::Ptr ap_node_, ns3::Ptr channel_, int mcs_, int nss_, int network_, int link_); const char* get_cname() { return name.c_str(); } @@ -75,7 +72,7 @@ public: void add_sta_node() { n_sta_nodes++; } static bool is_ap(ns3::Ptr node); - static WifiZone* by_name(std::string name); + static WifiZone* by_name(const std::string& name); private: std::string name;