Modify group remove logic

Description: wfd_util_is_remove_group_allowed is needed in
group destroyed event and remove duplicated logic.

Change-Id: I0264d61605c13785c4fcdea74fad074fa9603e8d
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 6a107245fe44b45bb589a224417f3529a3c2363d..be959d75c3a6bd545a43a6e6e842ea59b3e9d12d 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.262
+Version:       1.2.263
 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 006f83571405bd37045d82bb910cc99a44f6bd93..936b97054d2a751ee6f4b312fa8595398725f043 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -1297,7 +1297,7 @@ void wfd_event_sta_disconnected(wfd_oem_event_s *event)
        }
 
        /* If there is no member, GO should be destroyed */
-       if (!group->member_count) {
+       if (!group->member_count && wfd_util_is_remove_group_allowed()) {
                wfd_oem_destroy_group(manager->oem_ops, group->ifname);
                wfd_destroy_group(manager);
                wfd_peer_clear_all(manager);

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index fdd1fc7eea58d0d477439ed6f450c805b2dc7ae2..6543207e4580d5e20a135140185d637e4f057e71 100644 (file)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -1125,10 +1125,6 @@ int wfd_manager_disconnect(wfd_manager_s *manager, unsigned char *peer_addr)
        WDS_LOGE("Succeeded to disconnect peer");
 
        wfd_group_remove_member(group, peer_addr);
-       if (!group->member_count) {
-               wfd_oem_destroy_group(manager->oem_ops, group->ifname);
-               wfd_destroy_group(manager);
-       }
 
        if (manager->local->dev_role == WFD_DEV_ROLE_GO) {
                wfd_state_set(manager, WIFI_DIRECT_STATE_GROUP_OWNER);