Implement RED module for ns3 into simgrid code.

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

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 484a49f..aab3a04 100644 (file)
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -10,12 +10,28 @@
 #ifdef __cplusplus
 
 #include "ns3/core-module.h"
-#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"
+#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"
+#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"
+#endif
 
 using namespace ns3;
 using namespace std;
@@ -24,8 +40,7 @@ struct MySocket{
   uint32_t bufferedBytes;
   uint32_t sentBytes;
   uint32_t remaining;
-  uint32_t TotalBytes;
-  uint32_t last_amount_sent;
+  uint32_t totalBytes;
   char finished;
   void* action;
 };
@@ -45,12 +60,10 @@ public:
                                                const char *addr,
                                                uint32_t TotalBytes,
                                                void * action);
-       void simulator_stop(double min);
-       void simulator_start(void);
+       void simulator_start(double min);
        void* get_action_from_socket(void *socket);
        double get_remains_from_socket(void *socket);
-       double get_last_amount_sent_from_socket(void *socket);
-       void reset_last_amount_sent_from_socket(void *socket);
+       double get_sent_from_socket(void *socket);
        char get_finished(void *socket);
 };