From: hyunuktak Date: Thu, 10 Nov 2016 00:47:54 +0000 (+0900) Subject: Modified the signal handler for overlap connection/disconnection callback X-Git-Tag: submit/tizen_3.0/20161114.042815^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36232c25d158f3a97fc98ad0db9e5844b49db283;p=platform%2Fcore%2Fapi%2Fwifi-manager.git Modified the signal handler for overlap connection/disconnection callback Change-Id: I2f44aa2639ef67f10c52ec59bb15889397bcaf6e Signed-off-by: hyunuktak --- diff --git a/packaging/capi-network-wifi-manager.spec b/packaging/capi-network-wifi-manager.spec index 86a94a9..1aed2c9 100755 --- a/packaging/capi-network-wifi-manager.spec +++ b/packaging/capi-network-wifi-manager.spec @@ -1,6 +1,6 @@ Name: capi-network-wifi-manager Summary: Network Wi-Fi library in TIZEN C API -Version: 1.0.10 +Version: 1.0.11 Release: 1 Group: System/Network License: Apache-2.0 diff --git a/src/network_signal.c b/src/network_signal.c index 658fe34..1399da2 100755 --- a/src/network_signal.c +++ b/src/network_signal.c @@ -514,22 +514,6 @@ static int __net_handle_service_state_changed(const gchar *sig_path, const char *svc_name3 = request_table[NETWORK_REQUEST_TYPE_ENROLL_WPS].ProfileName; - if (request_table[NETWORK_REQUEST_TYPE_OPEN_CONNECTION].flag != TRUE && - request_table[NETWORK_REQUEST_TYPE_ENROLL_WPS].flag != TRUE && - request_table[NETWORK_REQUEST_TYPE_CLOSE_CONNECTION].flag != TRUE) { - /** Send Close Ind */ - event_data.Error = Error; - event_data.Event = NET_EVENT_CLOSE_IND; - g_strlcpy(event_data.ProfileName, sig_path, NET_PROFILE_NAME_LEN_MAX+1); - - event_data.Datalength = 0; - event_data.Data = NULL; - - WIFI_LOG(WIFI_INFO, "Sending NET_EVENT_CLOSE_IND"); - - _net_client_callback(&event_data); - } - if (request_table[NETWORK_REQUEST_TYPE_OPEN_CONNECTION].flag == TRUE && strstr(sig_path, svc_name2) != NULL) { memset(&request_table[NETWORK_REQUEST_TYPE_OPEN_CONNECTION], 0, @@ -548,6 +532,7 @@ static int __net_handle_service_state_changed(const gchar *sig_path, _net_dbus_pending_call_unref(); _net_client_callback(&event_data); + break; } if (request_table[NETWORK_REQUEST_TYPE_ENROLL_WPS].flag == TRUE && @@ -567,6 +552,7 @@ static int __net_handle_service_state_changed(const gchar *sig_path, _net_dbus_pending_call_unref(); _net_client_callback(&event_data); + break; } if (request_table[NETWORK_REQUEST_TYPE_CLOSE_CONNECTION].flag == TRUE && @@ -587,7 +573,21 @@ static int __net_handle_service_state_changed(const gchar *sig_path, _net_dbus_pending_call_unref(); _net_client_callback(&event_data); + break; } + + /** Send Close Ind */ + event_data.Error = Error; + event_data.Event = NET_EVENT_CLOSE_IND; + g_strlcpy(event_data.ProfileName, sig_path, NET_PROFILE_NAME_LEN_MAX+1); + + event_data.Datalength = 0; + event_data.Data = NULL; + + WIFI_LOG(WIFI_INFO, "Sending NET_EVENT_CLOSE_IND"); + + _net_client_callback(&event_data); + break; } case NET_STATE_TYPE_FAILURE: