clang-format these files, no change

[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 15f847d..b9270f9 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2016. 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. */
@@ -7,48 +6,33 @@
 #ifndef _NS3_INTERFACE_H
 #define _NS3_INTERFACE_H
 
-#include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/misc.h"
-#include "xbt/sysdep.h"
-
-typedef enum {
-       NS3_NETWORK_ELEMENT_NULL = 0,    /* NULL */
-       NS3_NETWORK_ELEMENT_HOST,       /* host type */
-       NS3_NETWORK_ELEMENT_ROUTER,     /* router type */
-       NS3_NETWORK_ELEMENT_AS,         /* AS type */
-} e_ns3_network_element_type_t;
-
-typedef struct ns3_nodes{
-       int node_num;
-       e_ns3_network_element_type_t type;
-       void * data;
-}s_ns3_nodes_t, *ns3_nodes_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <simgrid/s4u/host.hpp>
 
-XBT_PUBLIC(int)    ns3_finalize(void);
-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(void)   ns3_simulator(double min);
-XBT_PUBLIC(double) ns3_time(void);
-XBT_PUBLIC(void*)  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(char * id);
-XBT_PUBLIC(void *) ns3_add_host_cluster(char * id);
-XBT_PUBLIC(void *) ns3_add_router(char * id);
-XBT_PUBLIC(void *) ns3_add_AS(char * id);
-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,char *id);
-#ifdef __cplusplus
+namespace simgrid {
+namespace surf {
+class NetworkNS3Action;
 }
-#endif
+}
+
+class NetCardNs3 {
+public:
+  static simgrid::xbt::Extension<simgrid::kernel::routing::NetCard, NetCardNs3> EXTENSION_ID;
+
+  explicit NetCardNs3();
+  int node_num;
+};
+
+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,
+                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()
 
 #endif