X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcdbc53f2291d5ef450d6ff07ab25c25670c3527..1c01ad1876076615063e456092f25a3d7c598989:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 9dd44ba99a..a92c17d6d4 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -12,33 +12,10 @@
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
 
-/***********
- * Classes *
- ***********/
-
 namespace simgrid {
 namespace surf {
 
-class XBT_PRIVATE NetworkNS3Model;
-class XBT_PRIVATE NetworkNS3Action;
-
-}
-}
-
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
-
-/*********
- * Model *
- *********/
-
-namespace simgrid {
-namespace surf {
-
-class NetworkNS3Model : public NetworkModel {
+class XBT_PRIVATE NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
   ~NetworkNS3Model();
@@ -63,27 +40,24 @@ public:
   void updateLatency(double value) override {THROW_UNIMPLEMENTED;}
   void setBandwidthTrace(tmgr_trace_t trace) override;
   void setLatencyTrace(tmgr_trace_t trace) override;
-
-//private:
- int m_created;
 };
 
 /**********
  * Action *
  **********/
-class NetworkNS3Action : public NetworkAction {
+class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model *model, double cost, bool failed);
+  NetworkNS3Action(Model *model, double cost, NetCard *src, NetCard *dst);
 
-bool isSuspended();
-int unref();
-void suspend();
-void resume();
+  bool isSuspended();
+  int unref();
+  void suspend();
+  void resume();
 
 //private:
-  double m_lastSent;
-  NetCard *p_srcElm;
-  NetCard *p_dstElm;
+  double lastSent_ = 0;
+  NetCard *src_;
+  NetCard *dst_;
 };
 
 }