X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..1d5a3d36e9868cfd03eb3d067a9047c296ce3cb5:/src/kernel/routing/WifiZone.cpp

diff --git a/src/kernel/routing/WifiZone.cpp b/src/kernel/routing/WifiZone.cpp
index 5eae791f0e..df2b0c123a 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 <unordered_set>
@@ -16,12 +15,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) {
@@ -33,7 +28,7 @@ void WifiZone::seal()
   }
 }
 
-void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* res, double* lat)
+void WifiZone::get_local_route(const NetPoint* src, const 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());
 
@@ -43,31 +38,36 @@ 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();
     }
   }
 }
-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