From c5336021bcf616c6478c583fc390e6a056106342 Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Tue, 21 Jun 2016 11:36:56 +0900 Subject: [PATCH] Modify returning status value Description : There's no group owner state. Wi-Fi Direct state regarding that as connected. Change-Id: Ie0bde0944060c1dcecedd2d4f1873ed6dd9db415 Signed-off-by: Yu jiung --- CMakeLists.txt | 1 + packaging/capi-network-wifi-direct.spec | 4 +++- src/wifi-direct-client-proxy.c | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 127bc3c..bc444e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ SET(INCLUDEDIR "\${prefix}/include") SET(dependents "capi-base-common") SET(pc_dependents "capi-base-common") +#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fprofile-arcs -ftest-coverage") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") ADD_SUBDIRECTORY(src) diff --git a/packaging/capi-network-wifi-direct.spec b/packaging/capi-network-wifi-direct.spec index 478869b..2a8c3b3 100644 --- a/packaging/capi-network-wifi-direct.spec +++ b/packaging/capi-network-wifi-direct.spec @@ -1,6 +1,6 @@ Name: capi-network-wifi-direct Summary: Network WiFi-Direct Library -Version: 1.2.67 +Version: 1.2.68 Release: 1 Group: Network & Connectivity/API License: Apache-2.0 @@ -49,8 +49,10 @@ chmod 644 %{SOURCE0} %build export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" +#export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE -fprofile-arcs -ftest-coverage" export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" +#export LDFLAGS="-lgcov" MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` diff --git a/src/wifi-direct-client-proxy.c b/src/wifi-direct-client-proxy.c index c610541..6022dfb 100755 --- a/src/wifi-direct-client-proxy.c +++ b/src/wifi-direct-client-proxy.c @@ -142,6 +142,7 @@ static int __net_wifidirect_gerror_to_enum(GError* error) return ret; } +//LCOV_EXCL_START void __wfd_vconf_state_changed_cb(keynode_t *key, void *data) { __WDC_LOG_FUNC_START__; @@ -168,7 +169,7 @@ void __wfd_vconf_state_changed_cb(keynode_t *key, void *data) } else if (state == VCONFKEY_WIFI_DIRECT_CONNECTED) { state = WIFI_DIRECT_STATE_CONNECTED; } else if (state == VCONFKEY_WIFI_DIRECT_GROUP_OWNER) { - state = WIFI_DIRECT_STATE_GROUP_OWNER; + state = WIFI_DIRECT_STATE_CONNECTED; } else if (state == VCONFKEY_WIFI_DIRECT_DISCOVERING) { state = WIFI_DIRECT_STATE_DISCOVERING; } else { @@ -182,6 +183,7 @@ void __wfd_vconf_state_changed_cb(keynode_t *key, void *data) __WDC_LOG_FUNC_END__; return; } +//LCOV_EXCL_STOP /* Manage */ void wifi_direct_process_manage_activation(GDBusConnection *connection, @@ -2869,7 +2871,7 @@ int wifi_direct_get_state(wifi_direct_state_e *state) } else if (val == VCONFKEY_WIFI_DIRECT_CONNECTED) { *state = WIFI_DIRECT_STATE_CONNECTED; } else if (val == VCONFKEY_WIFI_DIRECT_GROUP_OWNER) { - *state = WIFI_DIRECT_STATE_GROUP_OWNER; + *state = WIFI_DIRECT_STATE_CONNECTED; } else if (val == VCONFKEY_WIFI_DIRECT_DISCOVERING) { *state = WIFI_DIRECT_STATE_DISCOVERING; } else { -- 2.7.4