fix bug(N_SE-44960, N_SE-44976)

Change-Id: Ibfc457f1cfca7f1f91c5810991ca717b6fc16401

diff --git a/debian/changelog b/debian/changelog
index e712fc4..d19adb5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wfi-direct-manager (0.6.25) precise; urgency=low
+
+  * Fix bug(N_SE-44976, N_SE-44960: Cancel connection has problem)
+  * Git : framework/connectivity/wifi-direct-manager
+  * Tag : wifi-direct-manager_0.6.25
+
+ -- Gibyoung Kim <lastkgb.kim@samsung.com>  Mon, 8 Jul 2013 13:47:12 +0900
+
 wfi-direct-manager (0.6.24) precise; urgency=low
 
   * SMACK manifest modified
@@ -12,7 +20,7 @@ wfi-direct-manager (0.6.23) precise; urgency=low
   * Git : framework/connectivity/wifi-direct-manager
   * Tag : wifi-direct-manager_0.6.23
 
- -- Gibyoung Kim <lastkgb.kim@samsung.com>  Mon, 6 May 2013 17:24:07+0900
+ -- Gibyoung Kim <lastkgb.kim@samsung.com>  Mon, 6 May 2013 17:24:07 +0900
 
 wfi-direct-manager (0.6.22) precise; urgency=low
 

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 86537ea..14f45d8 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:       wifi-direct-manager
 Summary:    Wi-Fi Direct manger
-Version:    0.6.24
+Version:    0.6.25
 Release:    1
 Group:      TO_BE_FILLED
 License:    Apache License Version 2.0

diff --git a/src/wifi-direct-client-handler.c b/src/wifi-direct-client-handler.c
index b2e6b88..a8f06d8 100644 (file)
--- a/src/wifi-direct-client-handler.c
+++ b/src/wifi-direct-client-handler.c
@@ -757,6 +757,24 @@ void wfd_server_process_client_request(wifi_direct_client_request_s * client_req
                        }
 
                }
+               else if (wfd_server->current_peer.is_group_owner)
+               {
+                       wfd_server_set_state(WIFI_DIRECT_STATE_DISCONNECTING);
+                       ret = wfd_oem_disconnect();
+                       if (ret)
+                       {
+                               wfd_server_remember_connecting_peer(client_req->data.mac_addr);
+                               wfd_server->config_data.wps_config = WIFI_DIRECT_WPS_TYPE_PBC;
+                       }
+                       else
+                       {
+                               wfd_server_set_state(WIFI_DIRECT_STATE_ACTIVATED);
+                               WDS_LOGE("Error... wfd_oem_disconnect() failed");
+                               noti.event = WIFI_DIRECT_CLI_EVENT_DISCONNECTION_RSP;
+                               noti.error = WIFI_DIRECT_ERROR_OPERATION_FAILED;
+                               __wfd_server_send_client_event(&noti);
+                       }
+               }
                else
                {
                        if (wfd_server->state < WIFI_DIRECT_STATE_CONNECTED) {