-#include "ns3/core-module.h"
-#include "ns3/helper-module.h"
-#include "ns3/simulator-module.h"
-#include "ns3/node-module.h"
-#include "ns3/helper-module.h"
-#include "ns3/global-routing-module.h"
-#include "ns3/tcp-socket-factory.h"
-
-using namespace ns3;
-using namespace std;
-
-struct MySocket{
- uint32_t sentBytes;
- uint32_t remaining;
- uint32_t TotalBytes;
- char finished;
- void* action;
+#include <cstdint>
+
+#include "ns3_interface.h"
+#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_;