Merge branch 'master' of framagit.org:Adrien.Gougeon/simgrid into master

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

diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp
index e22cb6d..3500c91 100644 (file)
--- a/src/surf/ns3/ns3_simulator.hpp
+++ b/src/surf/ns3/ns3_simulator.hpp
@@ -9,6 +9,7 @@
 #include "simgrid/s4u/Host.hpp"
 #include "src/surf/network_ns3.hpp"
 
+#include "ns3/wifi-module.h"
 #include <ns3/node.h>
 #include <ns3/tcp-socket-factory.h>
 
@@ -18,7 +19,10 @@ class XBT_PRIVATE NetPointNs3 {
 public:
   static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
 
+  void set_name(std::string name) { name_ = name; }
+
   explicit NetPointNs3();
+  std::string name_;
   ns3::Ptr<ns3::Node> ns3_node_;
   std::string ipv4_address_;
 };
@@ -26,7 +30,8 @@ public:
 XBT_PRIVATE void ns3_initialize(std::string TcpProtocol);
 XBT_PRIVATE void ns3_simulator(double max_seconds);
 XBT_PRIVATE void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst,
-                                      double bw, double lat, simgrid::s4u::Link::SharingPolicy policy);
+                                      double bw, double lat, std::string link_name,
+                                      simgrid::s4u::Link::SharingPolicy policy);
 
 class XBT_PRIVATE SgFlow {
 public:
@@ -50,4 +55,39 @@ static inline std::string transform_socket_ptr(ns3::Ptr<ns3::Socket> local_socke
   return sstream.str();
 }
 
+class XBT_PRIVATE WifiZone {
+public:
+  WifiZone(std::string name_, simgrid::s4u::Host* host_, ns3::Ptr<ns3::Node> ap_node_,
+           ns3::Ptr<ns3::YansWifiChannel> channel_, int mcs_, int nss_, int network_, int link_);
+
+  const char* get_cname() { return name.c_str(); }
+  simgrid::s4u::Host* get_host() { return host; }
+  ns3::Ptr<ns3::Node> get_ap_node() { return ap_node; }
+  ns3::Ptr<ns3::YansWifiChannel> get_channel() { return channel; }
+  int get_mcs() { return mcs; }
+  int get_nss() { return nss; }
+  int get_network() { return network; }
+  int get_link() { return link; }
+  int get_n_sta_nodes() { return n_sta_nodes; }
+
+  void set_network(int network_) { network = network_; }
+  void set_link(int link_) { link = link_; }
+  void add_sta_node() { n_sta_nodes++; }
+
+  static bool is_ap(ns3::Ptr<ns3::Node> node);
+  static WifiZone* by_name(std::string name);
+
+private:
+  std::string name;
+  simgrid::s4u::Host* host;
+  ns3::Ptr<ns3::Node> ap_node;
+  ns3::Ptr<ns3::YansWifiChannel> channel;
+  int mcs;
+  int nss;
+  int network;
+  int link;
+  int n_sta_nodes = 0;
+  static std::unordered_map<std::string, WifiZone*> wifi_zones;
+};
+
 #endif