X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ac1fa0456cc8bbe1401ed3fd94b845a0a3698f3..9bcd28fb0c558fbaa23ee46416f96baef5279045:/src/surf/ns3/ns3_simulator.hpp diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp index f1183c95cf..f4cd203afa 100644 --- a/src/surf/ns3/ns3_simulator.hpp +++ b/src/surf/ns3/ns3_simulator.hpp @@ -20,13 +20,13 @@ public: static simgrid::xbt::Extension EXTENSION_ID; explicit NetPointNs3(); - ns3::Ptr ns3_node_; + ns3::Ptr ns3_node_ = ns3::CreateObject(0); std::string ipv4_address_; }; 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, +XBT_PRIVATE void ns3_add_direct_route(const simgrid::kernel::routing::NetPoint* src, + const simgrid::kernel::routing::NetPoint* dst, double bw, double lat, simgrid::s4u::Link::SharingPolicy policy); class XBT_PRIVATE SgFlow { @@ -36,8 +36,8 @@ public: // private: std::uint32_t buffered_bytes_ = 0; std::uint32_t sent_bytes_ = 0; - std::uint32_t remaining_; std::uint32_t total_bytes_; + std::uint32_t remaining_; bool finished_ = false; simgrid::kernel::resource::NetworkNS3Action* action_; };