X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29cedcb0af274d0dd82224451767e8d01162d734..77163c152598f613abd0a938a967fcbd7a95fc8b:/src/surf/ns3/ns3_simulator.h

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 6296b1197a..c69c1a8d41 100644
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -1,57 +1,46 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. 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. */
 
-#ifndef _NS3_SIM_H
-#define _NS3_SIM_H
-
-#ifdef __cplusplus
+#ifndef NS3_SIM_H
+#define NS3_SIM_H
 
 #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;
-};
-
-//Simulator s;
-class NS3Sim {
 
-private:
+#include <ns3/csma-helper.h>
+#include <ns3/global-route-manager.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/packet-sink-helper.h>
+#include <ns3/point-to-point-helper.h>
+#include <ns3/tcp-socket-factory.h>
 
+class SgFlow {
 public:
-  NS3Sim();
-  ~NS3Sim();
-  void create_flow_NS3(ns3::Ptr<ns3::Node> src,
-            ns3::Ptr<ns3::Node> dst,
-            std::uint16_t port_number,
-            double start,
-            const char *addr,
-            std::uint32_t TotalBytes,
-            simgrid::surf::NetworkNS3Action * action);
-  void simulator_start(double min);
+  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_;
 };
 
-#endif                          /* __cplusplus */
+void StartFlow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number);
+
+static inline const char* transformSocketPtr(ns3::Ptr<ns3::Socket> localSocket)
+{
+  static char key[24];
+  std::stringstream sstream;
+  sstream << localSocket;
+  snprintf(key, 24, "%s", sstream.str().c_str());
+
+  return key;
+}
 
 #endif