Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9377a0d2 authored by Roshan Pius's avatar Roshan Pius
Browse files

wifi(implementation): Use real iface names 

Currently the HAL shim uses fake names to ensure that each type of
IWifiIface has a unique name. This is not a true reflection of the
network interfaces exposed by the wifi driver. So, change the HIDL shim
to use the corresponding interfaces names.

IWifiStaIface, IWifiApIface & IWifiNanIface all use the same "wlan0"
network interface.
IWifiP2pIface uses the "p2p0" network interface.

In the future, we'll be extending this to create a second IWifiStaIface
or IWifiApIface using "wlan1" network interface.

IWifiRttController does not need to be associated with an iface object.
So, it will just default to using "wlan0" always.
TODO(b/34702983): Need to deprecate the bound iface from the HIDL interface.

Bug: 65671875
Test: Device boots up and connects to wifi networks.
Test: Will send for regression tests.
Change-Id: I33fef1332f2fe2da3f48ee87ef06660844699253
parent 0a01e751

wifi/1.2/default/wifi_chip.cpp

+40 −21
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <android-base/logging.h>

#include <cutils/properties.h>



#include "hidl_return_util.h"

#include "hidl_struct_util.h"
@@ -41,6 +42,27 @@ void invalidateAndClear(sp<Iface>& iface) { 
    iface.clear();

  }

}



std::string getWlan0IfaceName() {

  std::array<char, PROPERTY_VALUE_MAX> buffer;

  property_get("wifi.interface", buffer.data(), "wlan0");

  return buffer.data();

}



/** Not used yet.

std::string getWlan1IfaceName() {

  std::array<char, PROPERTY_VALUE_MAX> buffer;

  property_get("wifi.concurrent.interface", buffer.data(), "wlan1");

  return buffer.data();

}

*/



std::string getP2pIfaceName() {

  std::array<char, PROPERTY_VALUE_MAX> buffer;

  property_get("wifi.direct.interface", buffer.data(), "p2p0");

  return buffer.data();

}



}  // namepsace



namespace android {
@@ -539,7 +561,7 @@ std::pair<WifiStatus, sp<IWifiApIface>> WifiChip::createApIfaceInternal() { 
  if (current_mode_id_ != kApChipModeId || ap_iface_.get()) {

    return {createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE), {}};

  }

  std::string ifname = legacy_hal_.lock()->getApIfaceName();

  std::string ifname = getWlan0IfaceName();

  ap_iface_ = new WifiApIface(ifname, legacy_hal_);

  for (const auto& callback : event_cb_handler_.getCallbacks()) {

    if (!callback->onIfaceAdded(IfaceType::AP, ifname).isOk()) {
@@ -554,20 +576,19 @@ WifiChip::getApIfaceNamesInternal() { 
  if (!ap_iface_.get()) {

    return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS),

          {legacy_hal_.lock()->getApIfaceName()}};

  return {createWifiStatus(WifiStatusCode::SUCCESS), {getWlan0IfaceName()}};

}



std::pair<WifiStatus, sp<IWifiApIface>> WifiChip::getApIfaceInternal(

    const std::string& ifname) {

  if (!ap_iface_.get() || (ifname != legacy_hal_.lock()->getApIfaceName())) {

  if (!ap_iface_.get() || (ifname != getWlan0IfaceName())) {

    return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS), ap_iface_};

}



WifiStatus WifiChip::removeApIfaceInternal(const std::string& ifname) {

  if (!ap_iface_.get() || (ifname != legacy_hal_.lock()->getApIfaceName())) {

  if (!ap_iface_.get() || (ifname != getWlan0IfaceName())) {

    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);

  }

  invalidateAndClear(ap_iface_);
@@ -586,7 +607,7 @@ std::pair<WifiStatus, sp<IWifiNanIface>> WifiChip::createNanIfaceInternal() { 
        p2p_iface_.get()) {

      return {createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE), {}};

    }

    std::string ifname = legacy_hal_.lock()->getNanIfaceName();

    std::string ifname = getWlan0IfaceName();

    nan_iface_ = new WifiNanIface(ifname, legacy_hal_);

    for (const auto& callback : event_cb_handler_.getCallbacks()) {

      if (!callback->onIfaceAdded(IfaceType::NAN, ifname).isOk()) {
@@ -604,20 +625,19 @@ WifiChip::getNanIfaceNamesInternal() { 
  if (!nan_iface_.get()) {

    return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS),

          {legacy_hal_.lock()->getNanIfaceName()}};

  return {createWifiStatus(WifiStatusCode::SUCCESS), {getWlan0IfaceName()}};

}



std::pair<WifiStatus, sp<IWifiNanIface>> WifiChip::getNanIfaceInternal(

    const std::string& ifname) {

  if (!nan_iface_.get() || (ifname != legacy_hal_.lock()->getNanIfaceName())) {

  if (!nan_iface_.get() || (ifname != getWlan0IfaceName())) {

    return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS), nan_iface_};

}



WifiStatus WifiChip::removeNanIfaceInternal(const std::string& ifname) {

  if (!nan_iface_.get() || (ifname != legacy_hal_.lock()->getNanIfaceName())) {

  if (!nan_iface_.get() || (ifname != getWlan0IfaceName())) {

    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);

  }

  invalidateAndClear(nan_iface_);
@@ -635,7 +655,7 @@ std::pair<WifiStatus, sp<IWifiP2pIface>> WifiChip::createP2pIfaceInternal() { 
      nan_iface_.get()) {

    return {createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE), {}};

  }

  std::string ifname = legacy_hal_.lock()->getP2pIfaceName();

  std::string ifname = getP2pIfaceName();

  p2p_iface_ = new WifiP2pIface(ifname, legacy_hal_);

  for (const auto& callback : event_cb_handler_.getCallbacks()) {

    if (!callback->onIfaceAdded(IfaceType::P2P, ifname).isOk()) {
@@ -650,20 +670,19 @@ WifiChip::getP2pIfaceNamesInternal() { 
  if (!p2p_iface_.get()) {

    return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS),

          {legacy_hal_.lock()->getP2pIfaceName()}};

  return {createWifiStatus(WifiStatusCode::SUCCESS), {getP2pIfaceName()}};

}



std::pair<WifiStatus, sp<IWifiP2pIface>> WifiChip::getP2pIfaceInternal(

    const std::string& ifname) {

  if (!p2p_iface_.get() || (ifname != legacy_hal_.lock()->getP2pIfaceName())) {

  if (!p2p_iface_.get() || (ifname != getP2pIfaceName())) {

    return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS), p2p_iface_};

}



WifiStatus WifiChip::removeP2pIfaceInternal(const std::string& ifname) {

  if (!p2p_iface_.get() || (ifname != legacy_hal_.lock()->getP2pIfaceName())) {

  if (!p2p_iface_.get() || (ifname != getP2pIfaceName())) {

    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);

  }

  invalidateAndClear(p2p_iface_);
@@ -679,7 +698,7 @@ std::pair<WifiStatus, sp<IWifiStaIface>> WifiChip::createStaIfaceInternal() { 
  if (current_mode_id_ != kStaChipModeId || sta_iface_.get()) {

    return {createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE), {}};

  }

  std::string ifname = legacy_hal_.lock()->getStaIfaceName();

  std::string ifname = getWlan0IfaceName();

  sta_iface_ = new WifiStaIface(ifname, legacy_hal_);

  for (const auto& callback : event_cb_handler_.getCallbacks()) {

    if (!callback->onIfaceAdded(IfaceType::STA, ifname).isOk()) {
@@ -694,20 +713,19 @@ WifiChip::getStaIfaceNamesInternal() { 
  if (!sta_iface_.get()) {

    return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS),

          {legacy_hal_.lock()->getStaIfaceName()}};

  return {createWifiStatus(WifiStatusCode::SUCCESS), {getWlan0IfaceName()}};

}



std::pair<WifiStatus, sp<IWifiStaIface>> WifiChip::getStaIfaceInternal(

    const std::string& ifname) {

  if (!sta_iface_.get() || (ifname != legacy_hal_.lock()->getStaIfaceName())) {

  if (!sta_iface_.get() || (ifname != getWlan0IfaceName())) {

    return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};

  }

  return {createWifiStatus(WifiStatusCode::SUCCESS), sta_iface_};

}



WifiStatus WifiChip::removeStaIfaceInternal(const std::string& ifname) {

  if (!sta_iface_.get() || (ifname != legacy_hal_.lock()->getStaIfaceName())) {

  if (!sta_iface_.get() || (ifname != getWlan0IfaceName())) {

    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);

  }

  invalidateAndClear(sta_iface_);
@@ -721,7 +739,8 @@ WifiStatus WifiChip::removeStaIfaceInternal(const std::string& ifname) { 


std::pair<WifiStatus, sp<IWifiRttController>>

WifiChip::createRttControllerInternal(const sp<IWifiIface>& bound_iface) {

  sp<WifiRttController> rtt = new WifiRttController(bound_iface, legacy_hal_);

  sp<WifiRttController> rtt =

      new WifiRttController(getWlan0IfaceName(), bound_iface, legacy_hal_);

  rtt_controllers_.emplace_back(rtt);

  return {createWifiStatus(WifiStatusCode::SUCCESS), rtt};

}

wifi/1.2/default/wifi_legacy_hal.cpp

+0 −25
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <chrono>



#include <android-base/logging.h>

#include <cutils/properties.h>



#include "hidl_sync_util.h"

#include "wifi_legacy_hal.h"
@@ -404,30 +403,6 @@ wifi_error WifiLegacyHal::stop( 
  return WIFI_SUCCESS;

}



std::string WifiLegacyHal::getApIfaceName() {

  // Fake name. This interface does not exist in legacy HAL

  // API's.

  return "ap0";

}



std::string WifiLegacyHal::getNanIfaceName() {

  // Fake name. This interface does not exist in legacy HAL

  // API's.

  return "nan0";

}



std::string WifiLegacyHal::getP2pIfaceName() {

  std::array<char, PROPERTY_VALUE_MAX> buffer;

  property_get("wifi.direct.interface", buffer.data(), "p2p0");

  return buffer.data();

}



std::string WifiLegacyHal::getStaIfaceName() {

  std::array<char, PROPERTY_VALUE_MAX> buffer;

  property_get("wifi.interface", buffer.data(), "wlan0");

  return buffer.data();

}



std::pair<wifi_error, std::string> WifiLegacyHal::getDriverVersion() {

  std::array<char, kMaxVersionStringLength> buffer;

  buffer.fill(0);

wifi/1.2/default/wifi_legacy_hal.h

+0 −5
Original line number Diff line number Diff line
@@ -140,11 +140,6 @@ using on_error_alert_callback = 
class WifiLegacyHal {

 public:

  WifiLegacyHal();

  // Names to use for the different types of iface.

  std::string getApIfaceName();

  std::string getNanIfaceName();

  std::string getP2pIfaceName();

  std::string getStaIfaceName();



  // Initialize the legacy HAL function table.

  wifi_error initialize();

wifi/1.2/default/wifi_rtt_controller.cpp

+3 −1
Original line number Diff line number Diff line
@@ -29,9 +29,11 @@ namespace implementation { 
using hidl_return_util::validateAndCall;



WifiRttController::WifiRttController(

    const std::string& iface_name,

    const sp<IWifiIface>& bound_iface,

    const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)

    : bound_iface_(bound_iface), legacy_hal_(legacy_hal), is_valid_(true) {}

    : ifname_(iface_name), bound_iface_(bound_iface), legacy_hal_(legacy_hal),

      is_valid_(true) {}



void WifiRttController::invalidate() {

  legacy_hal_.reset();

wifi/1.2/default/wifi_rtt_controller.h

+4 −2
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ namespace implementation { 
 */

class WifiRttController : public V1_0::IWifiRttController {

 public:

  WifiRttController(const sp<IWifiIface>& bound_iface,

  WifiRttController(

      const std::string& iface_name, const sp<IWifiIface>& bound_iface,

      const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);

  // Refer to |WifiChip::invalidate()|.

  void invalidate();
@@ -88,6 +89,7 @@ class WifiRttController : public V1_0::IWifiRttController { 
                                     const RttResponder& info);

  WifiStatus disableResponderInternal(uint32_t cmd_id);



  std::string ifname_;

  sp<IWifiIface> bound_iface_;

  std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;

  std::vector<sp<IWifiRttControllerEventCallback>> event_callbacks_;