From 59dad3e7e11f29d1c5a6066ae3e8d1ed1e71da9c Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Tue, 11 Apr 2017 15:59:23 +0900 Subject: [PATCH] Disable WiFi context provider It uses deprecated wifi APIs, and they will be obsoleted. Anyway, the new job-scheduler will replace all of this package, I thus simply disable the wifi-related code for now. Change-Id: I28fcb768db78ab09ad4441ccdc96bbc7ef214310 Signed-off-by: Mu-Woong Lee --- packaging/context-provider.spec | 2 +- src/CMakeLists.txt | 2 +- src/shared/CMakeLists.txt | 1 - src/shared/WifiWrapper.cpp | 189 -------------------------------- src/shared/WifiWrapper.h | 76 ------------- 5 files changed, 2 insertions(+), 268 deletions(-) delete mode 100644 src/shared/WifiWrapper.cpp delete mode 100644 src/shared/WifiWrapper.h diff --git a/packaging/context-provider.spec b/packaging/context-provider.spec index 3325cb2..3dbd146 100644 --- a/packaging/context-provider.spec +++ b/packaging/context-provider.spec @@ -30,7 +30,7 @@ BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(capi-system-device) BuildRequires: pkgconfig(capi-system-runtime-info) BuildRequires: pkgconfig(capi-media-sound-manager) -BuildRequires: pkgconfig(capi-network-wifi) +#BuildRequires: pkgconfig(capi-network-wifi) #BuildRequires: pkgconfig(sensor) #BuildRequires: pkgconfig(motion) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2472289..fecf577 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,5 +20,5 @@ ADD_SUBDIRECTORY(headphone) ADD_SUBDIRECTORY(message) #ADD_SUBDIRECTORY(my-place) #ADD_SUBDIRECTORY(social-stats) -ADD_SUBDIRECTORY(wifi) +#ADD_SUBDIRECTORY(wifi) ENDIF("${FEATURES}" STREQUAL "extended") diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 7abe206..fc20fe4 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -2,7 +2,6 @@ SET(DEPS ${DEPS} capi-system-info capi-system-runtime-info capi-media-sound-manager - capi-network-wifi ) FILE(GLOB SRCS *.cpp) diff --git a/src/shared/WifiWrapper.cpp b/src/shared/WifiWrapper.cpp deleted file mode 100644 index c3097bf..0000000 --- a/src/shared/WifiWrapper.cpp +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. - * - * 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. - */ - -#include -#include "WifiWrapper.h" - -#define SET_CALLBACK(type, setFunc) \ - __cb##type = callback; \ - __cbData##type = userData; \ - if (__enabled##type) \ - return WIFI_ERROR_NONE; \ - int err = setFunc(__cbFunc##type, NULL); \ - if (err == WIFI_ERROR_NONE) \ - __enabled##type = true; \ - return err; - -#define UNSET_CALLBACK(type, unsetFunc) \ - __cb##type = NULL; \ - __cbData##type = NULL; \ - if (!__enabled##type) \ - return WIFI_ERROR_NONE; \ - for (auto it : __instances) { \ - if (it->__cb##type != NULL) \ - return WIFI_ERROR_NONE; \ - } \ - unsetFunc(); \ - return WIFI_ERROR_NONE; - -using namespace ctx; - -std::set WifiWrapper::__instances; -bool WifiWrapper::__enabledDeviceState = false; -bool WifiWrapper::__enabledConnectionState = false; -bool WifiWrapper::__enabledBackgroundScan = false; - -SO_EXPORT WifiWrapper::WifiWrapper() : - __cbDeviceState(NULL), - __cbConnectionState(NULL), - __cbBackgroundScan(NULL), - __cbDataDeviceState(NULL), - __cbDataConnectionState(NULL), - __cbDataBackgroundScan(NULL) -{ - if (__instances.empty()) - __init(); - - __instances.insert(this); - - _D("#instances = %d", __instances.size()); -} - -SO_EXPORT WifiWrapper::~WifiWrapper() -{ - if (__cbDeviceState) - unsetDeviceStateChangedCb(); - - if (__cbConnectionState) - unsetConnectionStateChangedCb(); - - if (__cbBackgroundScan) - unsetBackgroundScanCb(); - - __instances.erase(this); - - if (__instances.empty()) - __release(); - - _D("#instances = %d", __instances.size()); -} - -SO_EXPORT int WifiWrapper::isActivated(bool *activated) -{ - return wifi_is_activated(activated); -} - -SO_EXPORT int WifiWrapper::getConnectionState(wifi_connection_state_e *state) -{ - return wifi_get_connection_state(state); -} - -SO_EXPORT int WifiWrapper::getConnectedAP(wifi_ap_h *ap) -{ - return wifi_get_connected_ap(ap); -} - -SO_EXPORT int WifiWrapper::getEssidFromAP(wifi_ap_h ap, char **essid) -{ - return wifi_ap_get_essid(ap, essid); -} - -SO_EXPORT int WifiWrapper::getBssidFromAP(wifi_ap_h ap, char **bssid) -{ - return wifi_ap_get_bssid(ap, bssid); -} - -SO_EXPORT int WifiWrapper::destroyAP(wifi_ap_h ap) -{ - return wifi_ap_destroy(ap); -} - -SO_EXPORT int WifiWrapper::setDeviceStateChangedCb(wifi_device_state_changed_cb callback, void *userData) -{ - SET_CALLBACK(DeviceState, wifi_set_device_state_changed_cb) -} - -SO_EXPORT int WifiWrapper::unsetDeviceStateChangedCb() -{ - UNSET_CALLBACK(DeviceState, wifi_unset_device_state_changed_cb) -} - -SO_EXPORT int WifiWrapper::setConnectionStateChangedCb(wifi_connection_state_changed_cb callback, void *userData) -{ - SET_CALLBACK(ConnectionState, wifi_set_connection_state_changed_cb) -} - -SO_EXPORT int WifiWrapper::unsetConnectionStateChangedCb() -{ - UNSET_CALLBACK(ConnectionState, wifi_unset_connection_state_changed_cb) -} - -SO_EXPORT int WifiWrapper::setBackgroundScanCb(wifi_scan_finished_cb callback, void *userData) -{ - SET_CALLBACK(BackgroundScan, wifi_set_background_scan_cb) -} - -SO_EXPORT int WifiWrapper::unsetBackgroundScanCb() -{ - UNSET_CALLBACK(BackgroundScan, wifi_unset_background_scan_cb) -} - -SO_EXPORT int WifiWrapper::scan(wifi_scan_finished_cb callback, void *userData) -{ - return wifi_scan(callback, userData); -} - -SO_EXPORT int WifiWrapper::foreachFoundAP(wifi_found_ap_cb callback, void *userData) -{ - return wifi_foreach_found_aps(callback, userData); -} - -void WifiWrapper::__init() -{ - _D("Initialize"); - int err = wifi_initialize(); - IF_FAIL_VOID_TAG(err == WIFI_ERROR_NONE, _E, "wifi_initialize() failed"); -} - -void WifiWrapper::__release() -{ - _D("Deinitialize"); - wifi_deinitialize(); -} - -void WifiWrapper::__cbFuncDeviceState(wifi_device_state_e state, void *userData) -{ - for (auto it : __instances) { - if (it->__cbDeviceState) - it->__cbDeviceState(state, it->__cbDataDeviceState); - } -} - -void WifiWrapper::__cbFuncConnectionState(wifi_connection_state_e state, wifi_ap_h ap, void *userData) -{ - for (auto it : __instances) { - if (it->__cbConnectionState) - it->__cbConnectionState(state, ap, it->__cbDataConnectionState); - } -} - -void WifiWrapper::__cbFuncBackgroundScan(wifi_error_e error_code, void *userData) -{ - for (auto it : __instances) { - if (it->__cbBackgroundScan) - it->__cbBackgroundScan(error_code, it->__cbDataBackgroundScan); - } -} diff --git a/src/shared/WifiWrapper.h b/src/shared/WifiWrapper.h deleted file mode 100644 index 3dcd354..0000000 --- a/src/shared/WifiWrapper.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. - * - * 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 _CONTEXT_WIFI_WRAPPER_H_ -#define _CONTEXT_WIFI_WRAPPER_H_ - -#include -#include - -namespace ctx { - - /* Wifi API does not support multiple sessions in one process. - This is a wrapper class to walkaround the linitation of Wifi API. */ - class WifiWrapper { - public: - WifiWrapper(); - ~WifiWrapper(); - - int isActivated(bool *activated); - - int getConnectionState(wifi_connection_state_e *state); - int getConnectedAP(wifi_ap_h *ap); - - int getEssidFromAP(wifi_ap_h ap, char **essid); - int getBssidFromAP(wifi_ap_h ap, char **bssid); - int destroyAP(wifi_ap_h ap); - - int setDeviceStateChangedCb(wifi_device_state_changed_cb callback, void *userData); - int unsetDeviceStateChangedCb(); - - int setConnectionStateChangedCb(wifi_connection_state_changed_cb callback, void *userData); - int unsetConnectionStateChangedCb(); - - int setBackgroundScanCb(wifi_scan_finished_cb callback, void *userData); - int unsetBackgroundScanCb(); - - int scan(wifi_scan_finished_cb callback, void *userData); - int foreachFoundAP(wifi_found_ap_cb callback, void *userData); - - private: - void __init(); - void __release(); - - static void __cbFuncDeviceState(wifi_device_state_e state, void *userData); - static void __cbFuncConnectionState(wifi_connection_state_e state, wifi_ap_h ap, void *userData); - static void __cbFuncBackgroundScan(wifi_error_e error_code, void *userData); - - wifi_device_state_changed_cb __cbDeviceState; - wifi_connection_state_changed_cb __cbConnectionState; - wifi_scan_finished_cb __cbBackgroundScan; - - void *__cbDataDeviceState; - void *__cbDataConnectionState; - void *__cbDataBackgroundScan; - - static std::set __instances; - static bool __enabledDeviceState; - static bool __enabledConnectionState; - static bool __enabledBackgroundScan; - }; -} - -#endif /* _CONTEXT_WIFI_WRAPPER_H_ */ -- 2.34.1