added ssid for ns3 wifi

[simgrid.git] / src / surf / network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 01bce47..4f90b1d 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2020. 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. */
@@ -53,23 +53,6 @@ public:
   void set_latency(double value) override;
 };
 
-class NetworkWifiLink : public NetworkCm02Link {
-  /** @brief Hold every rates association between host and links (host name, rates id) */
-  std::map<xbt::string, int> host_rates_;
-
-  /** @brief A link can have several bandwidth attach to it (mostly use by wifi model) */
-  std::vector<Metric> bandwidths_;
-
-public:
-  NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                  s4u::Link::SharingPolicy policy, lmm::System* system);
-
-  void set_host_rate(s4u::Host* host, int rate_level);
-  /** @brief Get the AP rate associated to the host (or -1 if not associated to the AP) */
-  double get_host_rate(s4u::Host* host);
-  s4u::Link::SharingPolicy get_sharing_policy() override;
-};
-
 /**********
  * Action *
  **********/
@@ -77,7 +60,8 @@ class NetworkCm02Action : public NetworkAction {
   friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
 
 public:
-  NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
+  NetworkCm02Action(Model* model, s4u::Host& src, s4u::Host& dst, double cost, bool failed)
+      : NetworkAction(model, src, dst, cost, failed){};
   virtual ~NetworkCm02Action() = default;
   void update_remains_lazy(double now) override;
 };