ns3: gosh this code is ugly

[simgrid.git] / src / surf / ns3 / ns3_simulator.h

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 740c7e1..6296b11 100644 (file)
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -11,6 +11,7 @@
 
 #include <cstdint>
 
+#include "ns3_interface.h"
 #include "ns3/core-module.h"
 #include "my-point-to-point-helper.h"
 
@@ -25,12 +26,12 @@
 #include "ns3/tcp-socket-factory.h"
 
 struct MySocket{
-  std::uint32_t bufferedBytes;
-  std::uint32_t sentBytes;
+  std::uint32_t bufferedBytes = 0;
+  std::uint32_t sentBytes = 0;
   std::uint32_t remaining;
   std::uint32_t totalBytes;
-  char finished;
-  void* action;
+  bool finished = false;
+  simgrid::surf::NetworkNS3Action* action;
 };
 
 //Simulator s;
@@ -47,12 +48,8 @@ public:
             double start,
             const char *addr,
             std::uint32_t TotalBytes,
-            void * action);
+            simgrid::surf::NetworkNS3Action * action);
   void simulator_start(double min);
-  void* get_action_from_socket(void *socket);
-  double get_remains_from_socket(void *socket);
-  double get_sent_from_socket(void *socket);
-  char get_finished(void *socket);
 };
 
 #endif                          /* __cplusplus */