added ssid for ns3 wifi

[simgrid.git] / src / surf / network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 2982843..4271429 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -58,11 +58,6 @@ static int number_of_links = 1;
 static int number_of_networks = 1;
 
 /* wifi globals */
-
-/* This vector store the tuple for the different wifi zones:
- * zone name, ptr to AP node, channel, network, link, nb station nodes
-*/
-static std::vector <std::tuple <std::string, ns3::Ptr<ns3::Node>, ns3::Ptr <ns3::YansWifiChannel>, int, int, int> > wifi_zones;
 static ns3::WifiHelper wifi;
 static ns3::YansWifiPhyHelper wifiPhy = ns3::YansWifiPhyHelper::Default ();
 static ns3::YansWifiChannelHelper wifiChannel = ns3::YansWifiChannelHelper::Default ();
@@ -108,7 +103,6 @@ std::unordered_map<std::string, WifiZone*> WifiZone::wifi_zones;
 
 static void initialize_ns3_wifi() {
     wifi.SetStandard (ns3::WIFI_PHY_STANDARD_80211n_5GHZ);
-
     for (auto host : simgrid::s4u::Engine::get_instance()->get_all_hosts()) {
         const char* wifi_link = host->get_property("wifi_link");
         const char* wifi_mcs = host->get_property("wifi_mcs");
@@ -116,7 +110,7 @@ static void initialize_ns3_wifi() {
 
         if (wifi_link)
           new WifiZone(wifi_link, host, host->get_netpoint()->extension<NetPointNs3>()->ns3_node_,
-                       wifiChannel.Create (), wifi_mcs ? atoi(wifi_mcs) : 3, wifi_nss ? atoi(wifi_nss) : 1, 0, 0);
+                       wifiChannel.Create(), wifi_mcs ? atoi(wifi_mcs) : 3, wifi_nss ? atoi(wifi_nss) : 1, 0, 0);
     }
 }
 
@@ -368,8 +362,8 @@ LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwid
       wifiPhy.Set("Antennas", ns3::UintegerValue(zone->get_nss()));
       wifiPhy.Set("MaxSupportedTxSpatialStreams", ns3::UintegerValue(zone->get_nss()));
       wifiPhy.Set("MaxSupportedRxSpatialStreams", ns3::UintegerValue(zone->get_nss()));
-
-      wifiMac.SetType("ns3::ApWifiMac");
+      wifiMac.SetType("ns3::ApWifiMac",
+                      "Ssid", ns3::SsidValue(name));
 
       netA.Add(wifi.Install (wifiPhy, wifiMac, zone->get_ap_node()));
 
@@ -611,7 +605,9 @@ void ns3_add_direct_route(NetPointNs3* src, NetPointNs3* dst, double bw, double
       wifiPhy.Set("MaxSupportedTxSpatialStreams", ns3::UintegerValue(zone->get_nss()));
       wifiPhy.Set("MaxSupportedRxSpatialStreams", ns3::UintegerValue(zone->get_nss()));
 
-      wifiMac.SetType ("ns3::StaWifiMac");
+      wifiMac.SetType ("ns3::StaWifiMac",
+                       "Ssid", ns3::SsidValue(link_name),
+                       "ActiveProbing", ns3::BooleanValue(false));
 
       netA.Add(wifi.Install (wifiPhy, wifiMac, staNode));