cts-verifier: re-order calling destroy function

diff --git a/cts-verifier/cts-verifier-publish-test.c b/cts-verifier/cts-verifier-publish-test.c
index 87a3566..5d26cc7 100644 (file)
--- a/cts-verifier/cts-verifier-publish-test.c
+++ b/cts-verifier/cts-verifier-publish-test.c
@@ -186,8 +186,8 @@ static void __session_terminated_cb(wifi_aware_session_h session,
 {
        printf("Session is terminated\n");
        if (session != NULL) {
-               wifi_aware_session_destroy(session);
                wifi_aware_session_unset_message_received_cb(session);
+               wifi_aware_session_destroy(session);
        }
 }
 
@@ -260,11 +260,15 @@ static void run_common()
 static void clear_resources()
 {
        if (g_ndp) {
-               wifi_aware_data_path_destroy(g_ndp);
                wifi_aware_data_path_unset_terminated_cb(g_ndp);
+               wifi_aware_data_path_destroy(g_ndp);
        }
        g_ndp = NULL;
 
+       if (g_publish_handle)
+               wifi_aware_publish_destroy(g_publish_handle);
+       g_publish_handle = NULL;
+
        if (g_wifi_aware_session) {
                wifi_aware_session_unset_message_received_cb(g_wifi_aware_session);
                wifi_aware_session_unset_terminated_cb(g_wifi_aware_session);
@@ -272,10 +276,6 @@ static void clear_resources()
        }
        g_wifi_aware_session = NULL;
 
-       if (g_publish_handle)
-               wifi_aware_publish_destroy(g_publish_handle);
-       g_publish_handle = NULL;
-
        g_peer = NULL;
 }
 

diff --git a/cts-verifier/cts-verifier-subscribe-test.c b/cts-verifier/cts-verifier-subscribe-test.c
index 407a3f3..6d208d1 100644 (file)
--- a/cts-verifier/cts-verifier-subscribe-test.c
+++ b/cts-verifier/cts-verifier-subscribe-test.c
@@ -188,8 +188,8 @@ static void __session_terminated_cb(wifi_aware_session_h session,
 {
        printf("Session is terminated\n");
        if (session != NULL) {
-               wifi_aware_session_destroy(session);
                wifi_aware_session_unset_message_received_cb(session);
+               wifi_aware_session_destroy(session);
        }
 }
 
@@ -263,23 +263,23 @@ static void run_common()
 static void clear_resources()
 {
        if (g_ndp) {
-               wifi_aware_data_path_destroy(g_ndp);
                wifi_aware_data_path_unset_terminated_cb(g_ndp);
+               wifi_aware_data_path_destroy(g_ndp);
        }
        g_ndp = NULL;
 
+       if (g_subscribe_handle)
+               wifi_aware_subscribe_destroy(g_subscribe_handle);
+       g_subscribe_handle = NULL;
+
        if (g_wifi_aware_session) {
-               wifi_aware_session_destroy(g_wifi_aware_session);
                wifi_aware_session_unset_message_received_cb(g_wifi_aware_session);
                wifi_aware_session_unset_service_discovered_cb(g_wifi_aware_session);
                wifi_aware_session_unset_terminated_cb(g_wifi_aware_session);
+               wifi_aware_session_destroy(g_wifi_aware_session);
        }
        g_wifi_aware_session = NULL;
 
-       if (g_subscribe_handle)
-               wifi_aware_subscribe_destroy(g_subscribe_handle);
-       g_subscribe_handle = NULL;
-
        g_peer = NULL;
 }