X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a80a7488d5a9c1b57d287f939a310ee63c27583..272ccad1b68b6d9c17069f3c934886925bb15b5d:/src/surf/ns3/ns3_simulator.h diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h index aab3a04981..2d5c431dbb 100644 --- a/src/surf/ns3/ns3_simulator.h +++ b/src/surf/ns3/ns3_simulator.h @@ -13,24 +13,24 @@ #include "my-point-to-point-helper.h" #ifdef _NS3_3_10 - /*NS3 3.10*/ - #include "ns3/helper-module.h" - #include "ns3/simulator-module.h" - #include "ns3/node-module.h" - #include "ns3/helper-module.h" - #include "ns3/global-routing-module.h" - #include "ns3/tcp-socket-factory.h" + /*NS3 3.10*/ + #include "ns3/helper-module.h" + #include "ns3/simulator-module.h" + #include "ns3/node-module.h" + #include "ns3/helper-module.h" + #include "ns3/global-routing-module.h" + #include "ns3/tcp-socket-factory.h" #else - /*NS3 3.12*/ - #include "ns3/node.h" - #include "ns3/global-route-manager.h" - #include "ns3/csma-helper.h" - #include "ns3/internet-stack-helper.h" - #include "ns3/ipv4-address-helper.h" - #include "ns3/point-to-point-helper.h" - #include "ns3/packet-sink-helper.h" - #include "ns3/inet-socket-address.h" - #include "ns3/tcp-socket-factory.h" + /*NS3 3.12*/ + #include "ns3/node.h" + #include "ns3/global-route-manager.h" + #include "ns3/csma-helper.h" + #include "ns3/internet-stack-helper.h" + #include "ns3/ipv4-address-helper.h" + #include "ns3/point-to-point-helper.h" + #include "ns3/packet-sink-helper.h" + #include "ns3/inet-socket-address.h" + #include "ns3/tcp-socket-factory.h" #endif using namespace ns3; @@ -51,20 +51,20 @@ class NS3Sim { private: public: - NS3Sim(); - ~NS3Sim(); - void create_flow_NS3(Ptr src, - Ptr dst, - uint16_t port_number, - double start, - const char *addr, - uint32_t TotalBytes, - void * action); - void simulator_start(double min); - void* get_action_from_socket(void *socket); - double get_remains_from_socket(void *socket); - double get_sent_from_socket(void *socket); - char get_finished(void *socket); + NS3Sim(); + ~NS3Sim(); + void create_flow_NS3(Ptr src, + Ptr dst, + uint16_t port_number, + double start, + const char *addr, + uint32_t TotalBytes, + void * action); + void simulator_start(double min); + void* get_action_from_socket(void *socket); + double get_remains_from_socket(void *socket); + double get_sent_from_socket(void *socket); + char get_finished(void *socket); }; #endif /* __cplusplus */