Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / ns3 / ns3_interface.h

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index e667adec7873e2eb5b773f375bc8d2b14a7d72dc..9479f656f958354fd0de1d31ed656b5d4f01a499 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -6,7 +6,7 @@
 #ifndef NS3_INTERFACE_H
 #define NS3_INTERFACE_H
 
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Host.hpp"
 
 namespace simgrid {
 namespace surf {
@@ -26,12 +26,12 @@ SG_BEGIN_DECL()
 
 XBT_PUBLIC(void) ns3_initialize(const char* TcpProtocol);
 XBT_PUBLIC(void)
-ns3_create_flow(sg_host_t src, sg_host_t dst, double start, u_int32_t TotalBytes,
+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(int src, int dst, char* bw, char* lat);
-XBT_PUBLIC(void) ns3_add_cluster(const char* id, char* bw, char* lat);
+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()