stack.Install(ns3_node_);
}
-WifiZone::WifiZone(std::string name_, simgrid::s4u::Host* host_, ns3::Ptr<ns3::Node> ap_node_,
+WifiZone::WifiZone(const 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_)
: name(name_)
, host(host_)
return false;
}
-WifiZone* WifiZone::by_name(std::string name)
+WifiZone* WifiZone::by_name(const std::string& name)
{
WifiZone* zone;
try {
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()));
zone->set_network(number_of_networks);
zone->set_link(number_of_links);
- netpoint_ns3->ipv4_address_ = transformIpv4Address(addresses.GetAddress(addresses.GetN() - 1));
+ netpoint_ns3->ipv4_address_ = transformIpv4Address(addresses.GetAddress(1));
if (number_of_links == 255) {
xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
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));
ns3::Config::Set("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/ChannelWidth", ns3::UintegerValue(40));
- NetPointNs3* sta_netpointNs3 = WifiZone::is_ap(host_src->ns3_node_) ? host_src : host_dst;
- const char* wifi_distance = simgrid::s4u::Host::by_name(sta_netpointNs3->name_)->get_property("wifi_distance");
+ simgrid::kernel::routing::NetPoint* sta_netpoint = WifiZone::is_ap(host_src->ns3_node_) ? dst : src;
+ const char* wifi_distance = simgrid::s4u::Host::by_name(sta_netpoint->get_name())->get_property("wifi_distance");
ns3::Ptr<ns3::ListPositionAllocator> positionAllocS = ns3::CreateObject<ns3::ListPositionAllocator>();
positionAllocS->Add(ns3::Vector(wifi_distance ? atof(wifi_distance) : 10.0, 0, 0));
mobility.SetPositionAllocator(positionAllocS);
zone->add_sta_node();
XBT_DEBUG("\tInterface stack '%s'", addr.c_str());
auto addresses = address.Assign(netA);
- host_dst->ipv4_address_ = transformIpv4Address(addresses.GetAddress(addresses.GetN() - 1));
+ host_dst->ipv4_address_ = transformIpv4Address(addresses.GetAddress(1));
} else {
ns3::PointToPointHelper pointToPoint;