X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..d06a3c5e9caef9c7da9cdeca1a864c5ca253158a:/src/surf/ns3/ns3_simulator.hpp

diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp
index c007c2592d..602f0b9304 100644
--- a/src/surf/ns3/ns3_simulator.hpp
+++ b/src/surf/ns3/ns3_simulator.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
@@ -6,19 +6,36 @@
 #ifndef NS3_SIMULATOR_HPP
 #define NS3_SIMULATOR_HPP
 
+#include "simgrid/s4u/Host.hpp"
+
+#include <ns3/node.h>
+#include <ns3/tcp-socket-factory.h>
+
 #include <cstdint>
 
-#include "ns3_interface.hpp"
+namespace simgrid {
+namespace surf {
+class NetworkNS3Action;
+}
+} // namespace simgrid
 
-#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 NetPointNs3 {
+public:
+  static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
 
-class SgFlow {
+  explicit NetPointNs3();
+  int node_num;
+  ns3::Ptr<ns3::Node> ns3Node_;
+};
+
+XBT_PUBLIC(void) ns3_initialize(std::string TcpProtocol);
+extern "C" {
+XBT_PUBLIC(void) ns3_simulator(double maxSeconds);
+XBT_PUBLIC(void) ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat);
+XBT_PUBLIC(void) ns3_add_cluster(const char* id, double bw, double lat);
+}
+
+class XBT_PRIVATE SgFlow {
 public:
   SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);
 
@@ -33,14 +50,11 @@ public:
 
 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 inline std::string 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;
+  return sstream.str();
 }
 
 #endif