X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3eac9930d9884df93ae2beda0a1137c29b669274..6e9d86d55beb0e4da8e689bbd3ca576250c46cb4:/src/kernel/routing/WifiZone.cpp diff --git a/src/kernel/routing/WifiZone.cpp b/src/kernel/routing/WifiZone.cpp index 52965610d3..f6693e0bd1 100644 --- a/src/kernel/routing/WifiZone.cpp +++ b/src/kernel/routing/WifiZone.cpp @@ -16,12 +16,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_wifi, surf, "Routing part of surf"); 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) { @@ -55,18 +51,24 @@ void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* } } } -s4u::Link* WifiZone::create_link(const std::string& name, const std::vector& bandwidths, double latency, - s4u::Link::SharingPolicy policy) + +s4u::Link* WifiZone::create_link(const std::string& name, const std::vector& 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); - 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