Revert "Handle <InvitationResult> [P2P-INVITATION-RESULT status parameter]"

This reverts commit 43b3297f88ac99d21e01514bee20dcba3ca7f749.

Change-Id: Iacd2332a17820b571f07c455757d1e6250ebf96c

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index ecdde59..c873900 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -6,7 +6,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.271
+Version:       1.2.270
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
old mode 100755 (executable)
new mode 100644 (file)
index 18642bc..5c11d6d
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -2845,8 +2845,6 @@ static void _ws_process_invitation_result(GDBusConnection *connection,
 {
        __WDP_LOG_FUNC_ENTER__;
        wfd_oem_event_s event;
-       wfd_oem_invite_data_s* invite_data = NULL;
-       GVariantIter *iter = NULL;
 
        DEBUG_SIGNAL(sender, object_path, interface, signal, parameters);
 
@@ -2858,44 +2856,6 @@ static void _ws_process_invitation_result(GDBusConnection *connection,
 
        memset(&event, 0x0, sizeof(wfd_oem_event_s));
 
-       int status = 0;
-       invite_data = (wfd_oem_invite_data_s *)g_try_malloc0(sizeof(wfd_oem_invite_data_s));
-       if (!invite_data) {
-               WDP_LOGF("Failed to allocate memory for event.");
-               __WDP_LOG_FUNC_EXIT__;
-               return;
-       }
-
-       event.edata = (wfd_oem_invite_data_s *)invite_data;
-       event.edata_type = WFD_OEM_EDATA_TYPE_INVITE;
-       event.event_id = WFD_OEM_EVENT_INVITATION_RES;
-
-       if (parameters != NULL) {
-               g_variant_get(parameters, "(a{sv})", &iter);
-               if (iter != NULL) {
-                       gchar *key = NULL;
-                       GVariant *value = NULL;
-                       while (g_variant_iter_loop(iter, "{sv}", &key, &value)) {
-                               CHECK_KEY_VALUE(key, value);
-                               if (g_strcmp0(key, "status") == 0) {
-                                       g_variant_get(value, "i", &status);
-                                       WDP_LOGD("Retrive invitation status [%d]", status);
-                                       invite_data->status = status;
-                               } else if (g_strcmp0(key, "BSSID") == 0) {
-                                       if (__ws_unpack_ay(invite_data->bssid, value, WS_MACADDR_LEN)) {
-                                               WDP_LOGD("[" MACSTR "]", MAC2STR(invite_data->bssid));
-                                       }
-                               }
-                       }
-                       g_variant_iter_free(iter);
-               }
-       }
-
-       if (g_pd->callback->invitation_resp_cb)
-               g_pd->callback->invitation_resp_cb(&event);
-
-       g_free(event.edata);
-
        __WDP_LOG_FUNC_EXIT__;
 }
 

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
old mode 100755 (executable)
new mode 100644 (file)
index a451af6..20806b3
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -1022,29 +1022,6 @@ void wfd_event_invitation_res(wfd_oem_event_s *event)
 {
        __WDS_LOG_FUNC_ENTER__;//LCOV_EXCL_LINE
 
-       wfd_manager_s *manager = wfd_get_manager();
-       wfd_session_s *session = (wfd_session_s *)manager->session;
-       unsigned char *peer_addr = NULL;
-       wfd_oem_invite_data_s *edata = NULL;
-
-       if (!session) {
-               WDS_LOGE("Unexpected event. Session not exist");
-               __WDS_LOG_FUNC_EXIT__;
-               return;
-       }
-
-       peer_addr = wfd_session_get_peer_addr(session);
-       if (!peer_addr) {
-               WDS_LOGE("Session does not have peer");
-               return;
-       }
-
-       edata = (wfd_oem_invite_data_s *)event->edata;
-       if (edata->status != 0) {
-               WDS_LOGE("P2P-INVITATION-RESULT status= %d [Failed]", edata->status);
-               wfd_destroy_session(manager);
-       }
-
        __WDS_LOG_FUNC_EXIT__;//LCOV_EXCL_LINE
        return;
 }