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

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index 9e8de2d3af..0537b104e4 100644
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,7 +11,16 @@
 #include "xbt/dynar.h"
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
+#include <xbt/Extendable.hpp>
 
+#include <simgrid/s4u/host.hpp>
+#include <surf/surf_routing.h>
+
+namespace simgrid{
+  namespace surf{
+    class NetworkNS3Action;
+  }
+}
 typedef enum {
   NS3_NETWORK_ELEMENT_NULL = 0,    /* NULL */
   NS3_NETWORK_ELEMENT_HOST,      /* host type */
@@ -19,36 +28,43 @@ typedef enum {
   NS3_NETWORK_ELEMENT_AS,        /* AS type */
 } e_ns3_network_element_type_t;
 
-typedef struct ns3_nodes{
+
+typedef struct ns3_node {
   int node_num;
   e_ns3_network_element_type_t type;
-  void * data;
-}s_ns3_nodes_t, *ns3_nodes_t;
+} s_ns3_node_t, *ns3_node_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+XBT_PUBLIC_DATA(int) NS3_EXTENSION_ID;
 
-XBT_PUBLIC(int)    ns3_finalize(void);
+SG_BEGIN_DECL()
+
+XBT_PUBLIC(void)   ns3_finalize();
 XBT_PUBLIC(int)    ns3_initialize(const char* TcpProtocol);
-XBT_PUBLIC(int)    ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,void * action);
+XBT_PUBLIC(int)    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 min);
-XBT_PUBLIC(double) ns3_time(void);
-XBT_PUBLIC(void*)  ns3_get_socket_action(void *socket);
+XBT_PUBLIC(simgrid::surf::NetworkNS3Action*)  ns3_get_socket_action(void *socket);
 XBT_PUBLIC(double) ns3_get_socket_remains(void *socket);
 XBT_PUBLIC(double) ns3_get_socket_sent(void *socket);
-XBT_PUBLIC(char)   ns3_get_socket_is_finished(void *socket);
-XBT_PUBLIC(void *) ns3_add_host(const char * id);
+XBT_PUBLIC(bool)   ns3_get_socket_is_finished(void *socket);
 XBT_PUBLIC(void *) ns3_add_host_cluster(const char * id);
 XBT_PUBLIC(void *) ns3_add_router(const char * id);
 XBT_PUBLIC(void *) ns3_add_AS(const char * id);
-XBT_PUBLIC(void *) ns3_add_link(int src, e_ns3_network_element_type_t type_src,
+XBT_PUBLIC(void) ns3_add_link(int src, e_ns3_network_element_type_t type_src,
                 int dst, e_ns3_network_element_type_t type_dst,
                 char * bw,char * lat);
-XBT_PUBLIC(void *) ns3_end_platform(void);
-XBT_PUBLIC(void *) ns3_add_cluster(char * bw,char * lat,const char *id);
-#ifdef __cplusplus
+XBT_PUBLIC(void) ns3_end_platform(void);
+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);
 }
-#endif
+
+SG_END_DECL()
 
 #endif