X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..2613dece7ac1a22cb1edbed4e2803fc0a3e7db67:/src/kernel/routing/WifiZone.cpp diff --git a/src/kernel/routing/WifiZone.cpp b/src/kernel/routing/WifiZone.cpp index 2acdb0e6ce..b6d40835d8 100644 --- a/src/kernel/routing/WifiZone.cpp +++ b/src/kernel/routing/WifiZone.cpp @@ -1,20 +1,17 @@ -/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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. */ -#include "simgrid/kernel/routing/WifiZone.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "src/surf/network_interface.hpp" -#include "surf/surf.hpp" +#include +#include -#include +#include "src/kernel/resource/NetworkModel.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_wifi, surf, "Routing part of surf"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_wifi, ker_platform, "Kernel Wifi Routing"); namespace simgrid { -namespace kernel { -namespace routing { +namespace kernel::routing { void WifiZone::do_seal() { @@ -47,17 +44,16 @@ void WifiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* } } -s4u::Link* WifiZone::create_link(const std::string& name, const std::vector& bandwidths) +resource::StandardLinkImpl* WifiZone::do_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()); wifi_link_ = get_network_model()->create_wifi_link(name, bandwidths); wifi_link_->set_sharing_policy(s4u::Link::SharingPolicy::WIFI, {}); - return wifi_link_->get_iface(); + return wifi_link_; } -} // namespace routing -} // namespace kernel +} // namespace kernel::routing namespace s4u { NetZone* create_wifi_zone(const std::string& name)