-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#ifdef __cplusplus
+#include <cstdint>
+
#include "ns3/core-module.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;
+#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"
struct MySocket{
- uint32_t bufferedBytes;
- uint32_t sentBytes;
- uint32_t remaining;
- uint32_t totalBytes;
+ std::uint32_t bufferedBytes;
+ std::uint32_t sentBytes;
+ std::uint32_t remaining;
+ std::uint32_t totalBytes;
char finished;
void* action;
};
public:
NS3Sim();
~NS3Sim();
- void create_flow_NS3(Ptr<Node> src,
- Ptr<Node> dst,
- uint16_t port_number,
+ void create_flow_NS3(ns3::Ptr<ns3::Node> src,
+ ns3::Ptr<ns3::Node> dst,
+ std::uint16_t port_number,
double start,
const char *addr,
- uint32_t TotalBytes,
+ std::uint32_t TotalBytes,
void * action);
void simulator_start(double min);
void* get_action_from_socket(void *socket);