X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bb73cb3914b5f7b77a9ec1f8abe728e637cc016..fdab189916cad1bf47afa4f3c272c8ba26c36ed1:/src/surf/ns3/ns3_simulator.hpp

diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp
index edb6fc7c8b..d33a5638ec 100644
--- a/src/surf/ns3/ns3_simulator.hpp
+++ b/src/surf/ns3/ns3_simulator.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
@@ -7,53 +7,46 @@
 #define NS3_SIMULATOR_HPP
 
 #include "simgrid/s4u/Host.hpp"
+#include "src/surf/network_ns3.hpp"
 
 #include <ns3/node.h>
 #include <ns3/tcp-socket-factory.h>
 
 #include <cstdint>
 
-namespace simgrid {
-namespace surf {
-class NetworkNS3Action;
-}
-} // namespace simgrid
-
 class NetPointNs3 {
 public:
   static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
 
   explicit NetPointNs3();
   int node_num;
-  ns3::Ptr<ns3::Node> ns3Node_;
+  ns3::Ptr<ns3::Node> ns3_node_;
 };
 
 XBT_PUBLIC void ns3_initialize(std::string TcpProtocol);
-extern "C" {
-XBT_PUBLIC void ns3_simulator(double maxSeconds);
+XBT_PUBLIC void ns3_simulator(double max_seconds);
 XBT_PUBLIC void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat);
 XBT_PUBLIC void ns3_add_cluster(const char* id, double bw, double lat);
-}
 
 class XBT_PRIVATE SgFlow {
 public:
-  SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);
+  SgFlow(uint32_t total_bytes, simgrid::kernel::resource::NetworkNS3Action* action);
 
   // private:
-  std::uint32_t bufferedBytes_ = 0;
-  std::uint32_t sentBytes_     = 0;
+  std::uint32_t buffered_bytes_ = 0;
+  std::uint32_t sent_bytes_     = 0;
   std::uint32_t remaining_;
-  std::uint32_t totalBytes_;
+  std::uint32_t total_bytes_;
   bool finished_ = false;
-  simgrid::surf::NetworkNS3Action* action_;
+  simgrid::kernel::resource::NetworkNS3Action* action_;
 };
 
-void StartFlow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number);
+void start_flow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number);
 
-static inline std::string transformSocketPtr(ns3::Ptr<ns3::Socket> localSocket)
+static inline std::string transform_socket_ptr(ns3::Ptr<ns3::Socket> local_socket)
 {
   std::stringstream sstream;
-  sstream << localSocket;
+  sstream << local_socket;
   return sstream.str();
 }