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

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index d887e44ab3..1366932289 100644
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -1,52 +1,37 @@
-/* Copyright (c) 2007-2014. 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_INTERFACE_H
-#define _NS3_INTERFACE_H
+#ifndef NS3_INTERFACE_H
+#define NS3_INTERFACE_H
 
-#include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/misc.h"
-#include "xbt/sysdep.h"
-#include <xbt/Extendable.hpp>
+#include "simgrid/s4u/Host.hpp"
 
-#include <simgrid/s4u/host.hpp>
-#include <surf/surf_routing.h>
-
-namespace simgrid{
-  namespace surf{
-    class NetworkNS3Action;
-  }
+namespace simgrid {
+namespace surf {
+class NetworkNS3Action;
+}
 }
 
-typedef struct ns3_node {
-  int node_num;
-} s_ns3_node_t, *ns3_node_t;
+class NetPointNs3 {
+public:
+  static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
 
-XBT_PUBLIC_DATA(int) NS3_EXTENSION_ID;
+  explicit NetPointNs3();
+  int node_num;
+};
 
 SG_BEGIN_DECL()
 
-XBT_PUBLIC(void)   ns3_initialize(const char* TcpProtocol);
-XBT_PUBLIC(void)   ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action);
-XBT_PUBLIC(void)   ns3_simulator(double maxSeconds);
-XBT_PUBLIC(void *) ns3_add_host_cluster(const char * id);
-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(char * bw,char * lat,const char *id);
-
-inline
-ns3_node_t ns3_find_host(const char* id)
-{
-  sg_host_t host = sg_host_by_name(id);
-  if (host == nullptr)
-    return nullptr;
-  else
-    return (ns3_node_t) host->extension(NS3_EXTENSION_ID);
-}
+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,
+                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);
 
 SG_END_DECL()