X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc5f6ab8af78f2a72cd508a19408e9d367933aae..d4572bb4bef9682c2a981e6015566791eec8eea7:/src/surf/ns3/ns3_simulator.h

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 5e6792aad0..1335f0261b 100644
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -10,12 +10,26 @@
 #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"
+
+#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"
+#endif
 
 using namespace ns3;
 using namespace std;
@@ -25,7 +39,6 @@ struct MySocket{
   uint32_t sentBytes;
   uint32_t remaining;
   uint32_t totalBytes;
-  uint32_t last_amount_sent;
   char finished;
   void* action;
 };
@@ -50,8 +63,6 @@ public:
 	void* get_action_from_socket(void *socket);
 	double get_remains_from_socket(void *socket);
 	double get_sent_from_socket(void *socket);
-	double get_last_amount_sent_from_socket(void *socket);
-	void reset_last_amount_sent_from_socket(void *socket);
 	char get_finished(void *socket);
 };