5ba0a90cac
NAN operations are currently done on the STA interface.This resulted in the NAN sessions getting terminated in all the instances where the STA interface is restarted (IFF DOWN/UP), due to connected MAC randomization. Hence, remove the dependency of NAN over STA interface. This change expects the driver to create a dedicated interface for the NAN operations. The iface name needs to be set in "wifi.aware.interface" property. Bug: 1636219 Test: HAL unit tests Test: Device boots up and connects to wifi network. Change-Id: I1b6d64eb94334172a8cd621d0b15ed8c8dc87f91
186 lines
8.3 KiB
C++
186 lines
8.3 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef WIFI_NAN_IFACE_H_
|
|
#define WIFI_NAN_IFACE_H_
|
|
|
|
#include <android-base/macros.h>
|
|
#include <android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.h>
|
|
#include <android/hardware/wifi/1.4/IWifiNanIface.h>
|
|
|
|
#include "hidl_callback_util.h"
|
|
#include "wifi_iface_util.h"
|
|
#include "wifi_legacy_hal.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace wifi {
|
|
namespace V1_4 {
|
|
namespace implementation {
|
|
using namespace android::hardware::wifi::V1_0;
|
|
using namespace android::hardware::wifi::V1_2;
|
|
|
|
/**
|
|
* HIDL interface object used to control a NAN Iface instance.
|
|
*/
|
|
class WifiNanIface : public V1_4::IWifiNanIface {
|
|
public:
|
|
WifiNanIface(const std::string& ifname, bool is_dedicated_iface,
|
|
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal,
|
|
const std::weak_ptr<iface_util::WifiIfaceUtil> iface_util);
|
|
// Refer to |WifiChip::invalidate()|.
|
|
void invalidate();
|
|
bool isValid();
|
|
std::string getName();
|
|
|
|
// HIDL methods exposed.
|
|
Return<void> getName(getName_cb hidl_status_cb) override;
|
|
Return<void> getType(getType_cb hidl_status_cb) override;
|
|
Return<void> registerEventCallback(
|
|
const sp<V1_0::IWifiNanIfaceEventCallback>& callback,
|
|
registerEventCallback_cb hidl_status_cb) override;
|
|
Return<void> getCapabilitiesRequest(
|
|
uint16_t cmd_id, getCapabilitiesRequest_cb hidl_status_cb) override;
|
|
Return<void> enableRequest(uint16_t cmd_id,
|
|
const V1_0::NanEnableRequest& msg,
|
|
enableRequest_cb hidl_status_cb) override;
|
|
Return<void> configRequest(uint16_t cmd_id,
|
|
const V1_0::NanConfigRequest& msg,
|
|
configRequest_cb hidl_status_cb) override;
|
|
Return<void> disableRequest(uint16_t cmd_id,
|
|
disableRequest_cb hidl_status_cb) override;
|
|
Return<void> startPublishRequest(
|
|
uint16_t cmd_id, const NanPublishRequest& msg,
|
|
startPublishRequest_cb hidl_status_cb) override;
|
|
Return<void> stopPublishRequest(
|
|
uint16_t cmd_id, uint8_t sessionId,
|
|
stopPublishRequest_cb hidl_status_cb) override;
|
|
Return<void> startSubscribeRequest(
|
|
uint16_t cmd_id, const NanSubscribeRequest& msg,
|
|
startSubscribeRequest_cb hidl_status_cb) override;
|
|
Return<void> stopSubscribeRequest(
|
|
uint16_t cmd_id, uint8_t sessionId,
|
|
stopSubscribeRequest_cb hidl_status_cb) override;
|
|
Return<void> transmitFollowupRequest(
|
|
uint16_t cmd_id, const NanTransmitFollowupRequest& msg,
|
|
transmitFollowupRequest_cb hidl_status_cb) override;
|
|
Return<void> createDataInterfaceRequest(
|
|
uint16_t cmd_id, const hidl_string& iface_name,
|
|
createDataInterfaceRequest_cb hidl_status_cb) override;
|
|
Return<void> deleteDataInterfaceRequest(
|
|
uint16_t cmd_id, const hidl_string& iface_name,
|
|
deleteDataInterfaceRequest_cb hidl_status_cb) override;
|
|
Return<void> initiateDataPathRequest(
|
|
uint16_t cmd_id, const NanInitiateDataPathRequest& msg,
|
|
initiateDataPathRequest_cb hidl_status_cb) override;
|
|
Return<void> respondToDataPathIndicationRequest(
|
|
uint16_t cmd_id, const NanRespondToDataPathIndicationRequest& msg,
|
|
respondToDataPathIndicationRequest_cb hidl_status_cb) override;
|
|
Return<void> terminateDataPathRequest(
|
|
uint16_t cmd_id, uint32_t ndpInstanceId,
|
|
terminateDataPathRequest_cb hidl_status_cb) override;
|
|
|
|
Return<void> registerEventCallback_1_2(
|
|
const sp<V1_2::IWifiNanIfaceEventCallback>& callback,
|
|
registerEventCallback_1_2_cb hidl_status_cb) override;
|
|
Return<void> enableRequest_1_2(
|
|
uint16_t cmd_id, const V1_0::NanEnableRequest& msg1,
|
|
const V1_2::NanConfigRequestSupplemental& msg2,
|
|
enableRequest_1_2_cb hidl_status_cb) override;
|
|
Return<void> configRequest_1_2(
|
|
uint16_t cmd_id, const V1_0::NanConfigRequest& msg1,
|
|
const V1_2::NanConfigRequestSupplemental& msg2,
|
|
configRequest_1_2_cb hidl_status_cb) override;
|
|
Return<void> enableRequest_1_4(
|
|
uint16_t cmd_id, const NanEnableRequest& msg1,
|
|
const V1_2::NanConfigRequestSupplemental& msg2,
|
|
enableRequest_1_2_cb hidl_status_cb) override;
|
|
Return<void> configRequest_1_4(
|
|
uint16_t cmd_id, const NanConfigRequest& msg1,
|
|
const V1_2::NanConfigRequestSupplemental& msg2,
|
|
configRequest_1_2_cb hidl_status_cb) override;
|
|
|
|
private:
|
|
// Corresponding worker functions for the HIDL methods.
|
|
std::pair<WifiStatus, std::string> getNameInternal();
|
|
std::pair<WifiStatus, IfaceType> getTypeInternal();
|
|
WifiStatus registerEventCallbackInternal(
|
|
const sp<V1_0::IWifiNanIfaceEventCallback>& callback);
|
|
WifiStatus getCapabilitiesRequestInternal(uint16_t cmd_id);
|
|
WifiStatus enableRequestInternal(uint16_t cmd_id,
|
|
const V1_0::NanEnableRequest& msg);
|
|
WifiStatus configRequestInternal(uint16_t cmd_id,
|
|
const V1_0::NanConfigRequest& msg);
|
|
WifiStatus disableRequestInternal(uint16_t cmd_id);
|
|
WifiStatus startPublishRequestInternal(uint16_t cmd_id,
|
|
const NanPublishRequest& msg);
|
|
WifiStatus stopPublishRequestInternal(uint16_t cmd_id, uint8_t sessionId);
|
|
WifiStatus startSubscribeRequestInternal(uint16_t cmd_id,
|
|
const NanSubscribeRequest& msg);
|
|
WifiStatus stopSubscribeRequestInternal(uint16_t cmd_id, uint8_t sessionId);
|
|
WifiStatus transmitFollowupRequestInternal(
|
|
uint16_t cmd_id, const NanTransmitFollowupRequest& msg);
|
|
WifiStatus createDataInterfaceRequestInternal(
|
|
uint16_t cmd_id, const std::string& iface_name);
|
|
WifiStatus deleteDataInterfaceRequestInternal(
|
|
uint16_t cmd_id, const std::string& iface_name);
|
|
WifiStatus initiateDataPathRequestInternal(
|
|
uint16_t cmd_id, const NanInitiateDataPathRequest& msg);
|
|
WifiStatus respondToDataPathIndicationRequestInternal(
|
|
uint16_t cmd_id, const NanRespondToDataPathIndicationRequest& msg);
|
|
WifiStatus terminateDataPathRequestInternal(uint16_t cmd_id,
|
|
uint32_t ndpInstanceId);
|
|
|
|
WifiStatus registerEventCallback_1_2Internal(
|
|
const sp<V1_2::IWifiNanIfaceEventCallback>& callback);
|
|
WifiStatus enableRequest_1_2Internal(
|
|
uint16_t cmd_id, const V1_0::NanEnableRequest& msg1,
|
|
const V1_2::NanConfigRequestSupplemental& msg2);
|
|
WifiStatus configRequest_1_2Internal(
|
|
uint16_t cmd_id, const V1_0::NanConfigRequest& msg,
|
|
const V1_2::NanConfigRequestSupplemental& msg2);
|
|
WifiStatus enableRequest_1_4Internal(
|
|
uint16_t cmd_id, const NanEnableRequest& msg1,
|
|
const V1_2::NanConfigRequestSupplemental& msg2);
|
|
WifiStatus configRequest_1_4Internal(
|
|
uint16_t cmd_id, const NanConfigRequest& msg,
|
|
const V1_2::NanConfigRequestSupplemental& msg2);
|
|
|
|
// all 1_0 and descendant callbacks
|
|
std::set<sp<V1_0::IWifiNanIfaceEventCallback>> getEventCallbacks();
|
|
// all 1_2 and descendant callbacks
|
|
std::set<sp<V1_2::IWifiNanIfaceEventCallback>> getEventCallbacks_1_2();
|
|
|
|
std::string ifname_;
|
|
bool is_dedicated_iface_;
|
|
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
|
|
std::weak_ptr<iface_util::WifiIfaceUtil> iface_util_;
|
|
bool is_valid_;
|
|
hidl_callback_util::HidlCallbackHandler<V1_0::IWifiNanIfaceEventCallback>
|
|
event_cb_handler_;
|
|
hidl_callback_util::HidlCallbackHandler<V1_2::IWifiNanIfaceEventCallback>
|
|
event_cb_handler_1_2_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(WifiNanIface);
|
|
};
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_4
|
|
} // namespace wifi
|
|
} // namespace hardware
|
|
} // namespace android
|
|
|
|
#endif // WIFI_NAN_IFACE_H_
|