cosmetics in NS3

[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 ddf1ab603badfdde4e330919cd3c8c03eeffc477..89c10d2c014debd2fe811e906f492906b08b8980 100644 (file)
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -12,26 +12,29 @@
 #include <cstdint>
 
 #include "ns3_interface.h"
-#include "ns3/core-module.h"
-#include "my-point-to-point-helper.h"
-
-#include "ns3/node.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/csma-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/tcp-socket-factory.h"
-
-struct MySocket{
-  std::uint32_t bufferedBytes = 0;
-  std::uint32_t sentBytes = 0;
-  std::uint32_t remaining;
-  std::uint32_t totalBytes;
-  bool finished = false;
-  simgrid::surf::NetworkNS3Action* action;
+#include <ns3/core-module.h>
+
+#include <ns3/node.h>
+#include <ns3/global-route-manager.h>
+#include <ns3/csma-helper.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/point-to-point-helper.h>
+#include <ns3/packet-sink-helper.h>
+#include <ns3/inet-socket-address.h>
+#include <ns3/tcp-socket-factory.h>
+
+class SgFlow {
+public:
+  SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action * action);
+
+//private:
+  std::uint32_t bufferedBytes_ = 0;
+  std::uint32_t sentBytes_ = 0;
+  std::uint32_t remaining_;
+  std::uint32_t totalBytes_;
+  bool finished_ = false;
+  simgrid::surf::NetworkNS3Action* action_;
 };
 
 //Simulator s;