[wifi-direct-manager] Replaced is_legacy->is_p2p in peer data structure.

This patch will enable applicaiton to check whether a connected
peer is a p2p supported device or not.
A peer will not be having p2p support when it is a legacy wifi device.

Change-Id: Ib70043e0c8cce2168aec12b3abf467a5bf8e54b6
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index ecaa8ae..2246a29 100755 (executable)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -147,7 +147,7 @@ typedef struct {
        int dev_flags;
        int group_flags;
        int wps_mode;
-       int is_legacy;
+       int is_p2p;
 
        char passphrase[PASSPHRASE_LEN_MAX + 1];
 

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index ffd387a..a5c4dff 100755 (executable)
--- 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:       1.2.174
+Version:       1.2.175
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index 0623e14..f67392f 100755 (executable)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -980,7 +980,7 @@ static void __wfd_process_sta_connected(wfd_manager_s *manager, wfd_oem_event_s
 
                memcpy(peer->intf_addr, event->intf_addr, MACADDR_LEN);
                peer->state = WFD_PEER_STATE_CONNECTED;
-               peer->is_legacy = TRUE;
+               peer->is_p2p = FALSE;
 
                g_snprintf(peer_mac_address, MACSTR_LEN, MACSTR, MAC2STR(peer->dev_addr));
                wfd_manager_dbus_emit_signal(WFD_MANAGER_MANAGE_INTERFACE,

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index 067e0d6..8b801f2 100755 (executable)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -872,10 +872,10 @@ int wfd_manager_disconnect(wfd_manager_s *manager, unsigned char *peer_addr)
        wfd_state_set(manager, WIFI_DIRECT_STATE_DISCONNECTING);
 
        if (manager->local->dev_role == WFD_DEV_ROLE_GO) {
-               if (peer->is_legacy)
-                       res = wfd_oem_disconnect(manager->oem_ops, peer->intf_addr, 1);
-               else
+               if (peer->is_p2p)
                        res = wfd_oem_disconnect(manager->oem_ops, peer->dev_addr, 0);
+               else
+                       res = wfd_oem_disconnect(manager->oem_ops, peer->intf_addr, 1);
        } else {
                res = wfd_oem_destroy_group(manager->oem_ops, group->ifname);
        }
@@ -1205,7 +1205,7 @@ int wfd_manager_get_connected_peers(wfd_manager_s *manager, wfd_connected_peer_i
                        peers[count].category = peer->pri_dev_type;
                        peers[count].subcategory = peer->sec_dev_type;
                        peers[count].channel = peer->channel;
-                       peers[count].is_p2p = 1;
+                       peers[count].is_p2p = peer->is_p2p;
 #ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
                        peers[count].services = 0;
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */

diff --git a/src/wifi-direct-peer.c b/src/wifi-direct-peer.c
index c7c4ee5..b0dc68f 100644 (file)
--- a/src/wifi-direct-peer.c
+++ b/src/wifi-direct-peer.c
@@ -69,7 +69,7 @@ wfd_device_s *wfd_add_peer(void *data, unsigned char *dev_addr, char *dev_name)
        }
        memcpy(peer->dev_addr, dev_addr, MACADDR_LEN);
        g_strlcpy(peer->dev_name, dev_name, DEV_NAME_LEN + 1);
-       peer->is_legacy = FALSE;
+       peer->is_p2p = TRUE;
 
        manager->peers = g_list_prepend(manager->peers, peer);
        manager->peer_count++;