Merge "Connection should be made with go_dev_addr received in InvitationReceived...

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index c451b53..f279bc4 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -1024,8 +1024,14 @@ void wfd_event_invitation_req(wfd_oem_event_s *event)
        memcpy(peer->intf_addr, edata->bssid, MACADDR_LEN);
        wfd_update_peer_time(manager, event->dev_addr);
 
-       session = wfd_create_session(manager, event->dev_addr,
-                                       manager->req_wps_mode, SESSION_DIRECTION_INCOMING);
+       if (edata->go_dev_addr)
+               session = wfd_create_session(manager, edata->go_dev_addr,
+                                            manager->req_wps_mode,
+                                            SESSION_DIRECTION_INCOMING);
+       else
+               session = wfd_create_session(manager, event->dev_addr,
+                                            manager->req_wps_mode,
+                                            SESSION_DIRECTION_INCOMING);
        if (!session) {
                WDS_LOGE("Failed to create session");
                __WDS_LOG_FUNC_EXIT__;
@@ -1044,7 +1050,13 @@ void wfd_event_invitation_req(wfd_oem_event_s *event)
                return;
        }
 
-       g_snprintf(peer_mac_address, MACSTR_LEN, MACSTR, MAC2STR(event->dev_addr));
+       if (edata->go_dev_addr)
+               g_snprintf(peer_mac_address, MACSTR_LEN, MACSTR,
+                          MAC2STR(edata->go_dev_addr));
+       else
+               g_snprintf(peer_mac_address, MACSTR_LEN, MACSTR,
+                          MAC2STR(event->dev_addr));
+
        wfd_manager_dbus_emit_signal(WFD_MANAGER_MANAGE_INTERFACE,
                                     "Connection",
                                     g_variant_new("(iis)", WIFI_DIRECT_ERROR_NONE,