moved a line for comprehension

[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 ca2056d..04944b1 100644 (file)
--- a/src/surf/ns3/ns3_simulator.hpp
+++ b/src/surf/ns3/ns3_simulator.hpp
@@ -11,6 +11,7 @@
 
 #include <ns3/node.h>
 #include <ns3/tcp-socket-factory.h>
+#include "ns3/wifi-module.h"
 
 #include <cstdint>
 
@@ -18,14 +19,19 @@ class 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_;
   int node_num;
   ns3::Ptr<ns3::Node> ns3_node_;
+
 };
 
 XBT_PUBLIC void ns3_initialize(std::string TcpProtocol);
 XBT_PUBLIC void ns3_simulator(double max_seconds);
-XBT_PUBLIC void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat);
+XBT_PUBLIC void ns3_add_direct_route(NetPointNs3* src, NetPointNs3* dst, double bw, double lat, std::string link_name,
+                                     simgrid::s4u::Link::SharingPolicy policy);
 XBT_PUBLIC void ns3_add_cluster(const char* id, double bw, double lat);
 
 class XBT_PRIVATE SgFlow {
@@ -50,4 +56,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