-/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
namespace simgrid {
namespace kernel {
namespace routing {
-WifiZone::WifiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
- : RoutedZone(father, name, netmodel)
-{
-}
-void WifiZone::seal()
+void WifiZone::do_seal()
{
const char* AP_name = get_property("access_point");
if (AP_name != nullptr) {
xbt_assert(access_point_ != nullptr, "Access point '%s' of WIFI zone '%s' does not exist: no such host or router.",
AP_name, get_cname());
xbt_assert(access_point_->is_host() || access_point_->is_router(),
- "Access point '%s' of WIFI zone '%s' must be either an host or a router.", AP_name, get_cname());
+ "Access point '%s' of WIFI zone '%s' must be either a host or a router.", AP_name, get_cname());
}
}
if (wifi_link_ != nullptr) {
// If src and dst are nodes, not access_point, we need to traverse the link twice
- // Otherwise (if src or dst is access_poit), we need to traverse the link only once
+ // Otherwise (if src or dst is access_point), we need to traverse the link only once
if (src != access_point_) {
XBT_DEBUG("src %s is not our gateway", src->get_cname());
}
}
}
-s4u::Link* WifiZone::create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
- s4u::Link::SharingPolicy policy,
- const std::unordered_map<std::string, std::string>* props)
+
+s4u::Link* WifiZone::create_link(const std::string& name, const std::vector<double>& bandwidths)
{
xbt_assert(wifi_link_ == nullptr,
"WIFI netzone %s contains more than one link. Please only declare one, the wifi link.", get_cname());
- xbt_assert(policy == s4u::Link::SharingPolicy::WIFI, "Link %s in WIFI zone %s must follow the WIFI sharing policy.",
- name.c_str(), get_cname());
- auto s4u_link = NetZoneImpl::create_link(name, bandwidths, latency, policy, props);
- wifi_link_ = s4u_link->get_impl();
- return s4u_link;
+ wifi_link_ = get_network_model()->create_wifi_link(name, bandwidths);
+ wifi_link_->set_sharing_policy(s4u::Link::SharingPolicy::WIFI);
+ return wifi_link_->get_iface();
}
} // namespace routing
} // namespace kernel
+
+namespace s4u {
+NetZone* create_wifi_zone(const std::string& name)
+{
+ return (new kernel::routing::WifiZone(name))->get_iface();
+}
+} // namespace s4u
+
} // namespace simgrid