X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..e5fac81b878c12bafe94ab9407bad0080a3d1581:/src/surf/ns3/ns3_interface.hpp

diff --git a/src/surf/ns3/ns3_interface.hpp b/src/surf/ns3/ns3_interface.hpp
index 58ed7d1416..a1c523f3d7 100644
--- a/src/surf/ns3/ns3_interface.hpp
+++ b/src/surf/ns3/ns3_interface.hpp
@@ -6,6 +6,7 @@
 #ifndef NS3_INTERFACE_HPP
 #define NS3_INTERFACE_HPP
 
+#include "ns3/ptr.h"
 #include "simgrid/s4u/Host.hpp"
 
 namespace simgrid {
@@ -13,6 +14,9 @@ namespace surf {
 class NetworkNS3Action;
 }
 }
+namespace ns3 {
+class Node;
+}
 
 class NetPointNs3 {
 public:
@@ -20,19 +24,17 @@ public:
 
   explicit NetPointNs3();
   int node_num;
+  ns3::Ptr<ns3::Node> ns3Node_;
 };
 
-SG_BEGIN_DECL()
-
-XBT_PUBLIC(void) ns3_initialize(const char* TcpProtocol);
+XBT_PUBLIC(void) ns3_initialize(std::string TcpProtocol);
+extern "C" {
 XBT_PUBLIC(void)
-ns3_create_flow(sg_host_t src, sg_host_t dst, u_int32_t TotalBytes,
-                simgrid::surf::NetworkNS3Action* action);
+ns3_create_flow(sg_host_t src, sg_host_t dst, u_int32_t TotalBytes, simgrid::surf::NetworkNS3Action* action);
 XBT_PUBLIC(void) ns3_simulator(double maxSeconds);
 XBT_PUBLIC(void*) ns3_add_router(const char* id);
 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);
-
-SG_END_DECL()
+}
 
 #endif