X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6ceacf3b05651e2ae5a40d47c96bdd9fc4d1416..3f4a0dbfdb32d46c05e88ab43308de4c64216988:/src/kernel/routing/WifiZone.cpp diff --git a/src/kernel/routing/WifiZone.cpp b/src/kernel/routing/WifiZone.cpp index 91ea7612e0..95f3c16b48 100644 --- a/src/kernel/routing/WifiZone.cpp +++ b/src/kernel/routing/WifiZone.cpp @@ -6,7 +6,6 @@ #include "simgrid/kernel/routing/WifiZone.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/xml/platf_private.hpp" #include "surf/surf.hpp" #include @@ -29,7 +28,7 @@ void WifiZone::do_seal() } } -void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* res, double* lat) +void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, Route* res, double* lat) { XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); @@ -39,13 +38,13 @@ void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* if (src != access_point_) { XBT_DEBUG("src %s is not our gateway", src->get_cname()); - res->link_list.push_back(wifi_link_); + res->link_list_.push_back(wifi_link_); if (lat) *lat += wifi_link_->get_latency(); } if (dst != access_point_) { XBT_DEBUG("dst %s is not our gateway", dst->get_cname()); - res->link_list.push_back(wifi_link_); + res->link_list_.push_back(wifi_link_); if (lat) *lat += wifi_link_->get_latency(); } @@ -57,9 +56,9 @@ s4u::Link* WifiZone::create_link(const std::string& name, const std::vectorset_sharing_policy(s4u::Link::SharingPolicy::WIFI); - 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