Replace wifi_aware_publish_config_h with wifi_aware_publish_h #2

diff --git a/include/wifi-aware.h b/include/wifi-aware.h
index 9f66fbc..990c6a1 100644 (file)
--- a/include/wifi-aware.h
+++ b/include/wifi-aware.h
@@ -391,7 +391,7 @@ int wifi_aware_enable(wifi_aware_h wifi_aware,
  * @param[in] user_data
  * @return     0 on success, otherwise a negative error value
  * @retval     #WIFI_AWARE_ERROR_NONE
- * @see wifi_aware_publish()
+ * @see wifi_aware_start_publish()
  */
 typedef void(*wifi_aware_published_cb)(wifi_aware_error_e error,
                unsigned int publish_id, void *user_data);
@@ -418,8 +418,7 @@ int wifi_aware_start_publish(wifi_aware_h wifi_aware,
  * @return     0 on success, otherwise a negative error value
  * @retval     #WIFI_AWARE_ERROR_NONE
  */
-int wifi_aware_cancel_publish(wifi_aware_h wifi_aware,
-               unsigned int publish_id);
+int wifi_aware_cancel_publish(wifi_aware_h wifi_aware, wifi_aware_publish_h publish);
 
 /**
  * @brief Update the configuration for a Wi-Fi Aware service that has already been published.

diff --git a/src/include/wifi-aware-gdbus.h b/src/include/wifi-aware-gdbus.h
index e01d934..e2b555a 100644 (file)
--- a/src/include/wifi-aware-gdbus.h
+++ b/src/include/wifi-aware-gdbus.h
@@ -52,8 +52,7 @@ void wifi_aware_gdbus_register_signal();
 int wifi_aware_gdbus_enable(wifi_aware_h wifi_aware,
                wifi_aware_enable_request_s *req, GAsyncReadyCallback cb);
 int wifi_aware_gdbus_publish(wifi_aware_publish_h publish, int client_id, GAsyncReadyCallback cb);
-int wifi_aware_gdbus_cancel_publish(wifi_aware_h wifi_aware, int client_id,
-               unsigned int pub_id);
+int wifi_aware_gdbus_cancel_publish(wifi_aware_publish_h publish, int client_id);
 int wifi_aware_gdbus_subscribe(wifi_aware_h wifi_aware, int client_id,
                wifi_aware_subscribe_request_s *req, GAsyncReadyCallback cb);
 int wifi_aware_gdbus_cancel_subscribe(wifi_aware_h wifi_aware, int client_id,

diff --git a/src/include/wifi-aware-private.h b/src/include/wifi-aware-private.h
index 2912cd1..8e339ad 100644 (file)
--- a/src/include/wifi-aware-private.h
+++ b/src/include/wifi-aware-private.h
@@ -42,7 +42,7 @@ void _add_subscribed_callback(wifi_aware_h wifi_aware,
 int _wifi_aware_enable_request(wifi_aware_h wifi_aware);
 int _wifi_aware_publish_request(wifi_aware_h wifi_aware,
                wifi_aware_publish_h publish);
-int _wifi_aware_cancel_publish_request(wifi_aware_h wifi_aware, unsigned int pub_id);
+int _wifi_aware_cancel_publish_request(wifi_aware_h wifi_aware, wifi_aware_publish_h publish);
 int _wifi_aware_subscribe_request(wifi_aware_h wifi_aware,
                wifi_aware_subscribe_config_h config);
 int _wifi_aware_cancel_subscribe_request(wifi_aware_h wifi_aware, unsigned int sub_id);

diff --git a/src/wifi-aware-gdbus.c b/src/wifi-aware-gdbus.c
index e396db4..33ab55f 100644 (file)
--- a/src/wifi-aware-gdbus.c
+++ b/src/wifi-aware-gdbus.c
@@ -351,15 +351,15 @@ static int __handle_cancel_publish_reply(GVariant *reply)
        return error;
 }
 
-int wifi_aware_gdbus_cancel_publish(wifi_aware_h wifi_aware, int client_id,
-               unsigned int pub_id)
+int wifi_aware_gdbus_cancel_publish(wifi_aware_publish_h publish, int client_id)
 {
        __WIFI_AWARE_FUNC_ENTER__;
        GVariant *params = NULL;
        GVariant *reply = NULL;
        int ret = WIFI_AWARE_ERROR_NONE;
+       wifi_aware_publish_request_s *req = _wifi_aware_publish_get_request(publish);
        
-       params = __create_cancel_publish_request_param(client_id, pub_id);
+       params = __create_cancel_publish_request_param(client_id, req->publish_id);
        DBUS_DEBUG_VARIANT(params);
 
        ret = __wifi_aware_dbus_method_call_sync(

diff --git a/src/wifi-aware-private.c b/src/wifi-aware-private.c
index b4531d9..b6d8a05 100644 (file)
--- a/src/wifi-aware-private.c
+++ b/src/wifi-aware-private.c
@@ -324,10 +324,10 @@ int _wifi_aware_publish_request(wifi_aware_h wifi_aware,
 }
 
 int _wifi_aware_cancel_publish_request(wifi_aware_h wifi_aware,
-               unsigned int pub_id)
+               wifi_aware_publish_h publish)
 {
        wifi_aware_s *aware = (wifi_aware_s *)wifi_aware;
-       return wifi_aware_gdbus_cancel_publish(wifi_aware, aware->client_id, pub_id);
+       return wifi_aware_gdbus_cancel_publish(publish, aware->client_id);
 }
 
 int _wifi_aware_subscribe_request(wifi_aware_h wifi_aware,

diff --git a/src/wifi-aware-publish.c b/src/wifi-aware-publish.c
index a615f29..855f6bd 100644 (file)
--- a/src/wifi-aware-publish.c
+++ b/src/wifi-aware-publish.c
@@ -68,7 +68,7 @@ wifi_aware_publish_request_s *_wifi_aware_publish_get_request(wifi_aware_publish
        RET_VAL_IF(publish == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_publish_h is NULL");
 
        wifi_aware_publish_s *handle = (wifi_aware_publish_s *)publish;
-       return &handle->req;
+       return &(handle->req);
 }
 
 void _wifi_aware_publish_invoke_callback(wifi_aware_error_e error, wifi_aware_publish_h publish)
@@ -219,7 +219,7 @@ API int wifi_aware_publish_set_enable_ranging(
        return WIFI_AWARE_ERROR_NONE;
 }
 
-API int wifi_aware_publish(wifi_aware_h wifi_aware,
+API int wifi_aware_start_publish(wifi_aware_h wifi_aware,
                wifi_aware_publish_h publish,
                wifi_aware_published_cb callback, void *user_data)
 {
@@ -239,16 +239,16 @@ API int wifi_aware_publish(wifi_aware_h wifi_aware,
        return WIFI_AWARE_ERROR_NONE;
 }
 
-API int wifi_aware_cancel_publish(wifi_aware_h wifi_aware,
-               unsigned int publish_id)
+API int wifi_aware_cancel_publish(wifi_aware_h wifi_aware, wifi_aware_publish_h publish)
 {
        __WIFI_AWARE_FUNC_ENTER__;
        int ret = WIFI_AWARE_ERROR_NONE;
 
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
        RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi_aware);
+       RET_VAL_IF(publish == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_publish_h is NULL");
 
-       ret = _wifi_aware_cancel_publish_request(wifi_aware, publish_id);
+       ret = _wifi_aware_cancel_publish_request(wifi_aware, publish);
        RET_VAL_IF(ret != WIFI_AWARE_ERROR_NONE, ret, "_wifi_aware_cancel_publish_request");
 
        __WIFI_AWARE_FUNC_EXIT__;

diff --git a/test/wifi-aware-test.c b/test/wifi-aware-test.c
index 7d919fd..b82e337 100644 (file)
--- a/test/wifi-aware-test.c
+++ b/test/wifi-aware-test.c
@@ -138,8 +138,8 @@ static char *g_menu_str[] = {
                 = NULL, };
 
 static GMainLoop *g_main_loop_p;
-static wifi_aware_h g_wifi_aware_handle;
-static unsigned int g_pub_id;
+static wifi_aware_h g_wifi_aware_handle = NULL;
+static wifi_aware_publish_h g_publish_handle = NULL;
 static unsigned int g_sub_id;
 
 /*****************************************************************************
@@ -330,11 +330,10 @@ void test_enable()
        __print_result(ret, "wifi_aware_enable");
 }
 
-static void __published_cb(wifi_aware_error_e error, unsigned int publish_id, void *user_data)
+static void __published_cb(wifi_aware_error_e error, wifi_aware_publish_h publish, void *user_data)
 {
-       g_pub_id = publish_id;
        if (error == WIFI_AWARE_ERROR_NONE)
-               printf("Publish Request is success. Publish ID: %u\n", publish_id);
+               printf("Publish Request is success. Publish ID: [*]\n");
        else
                printf("Subscribe Request fails. Error: %s\n", __print_error(error));
 }
@@ -394,7 +393,8 @@ void test_publish()
 
        __set_publish_config(config);
 
-       ret = wifi_aware_publish(g_wifi_aware_handle, config, __published_cb, NULL);
+       g_publish_handle = config;
+       ret = wifi_aware_start_publish(g_wifi_aware_handle, config, __published_cb, NULL);
        __print_result(ret, "wifi_aware_publish");
 
        ret = wifi_aware_publish_destroy(config);
@@ -408,12 +408,12 @@ void test_cancel_publish()
        RET_IF_LOOP_IS_NULL();
        RET_IF_HANDLE_IS_NULL();
 
-       if (g_pub_id < 1) {
+       if (g_publish_handle == NULL) {
                printf("publish should be done\n");
                return;
        }
 
-       ret = wifi_aware_cancel_publish(g_wifi_aware_handle, g_pub_id);
+       ret = wifi_aware_cancel_publish(g_wifi_aware_handle, g_publish_handle);
        __print_result(ret, "wifi_aware_cancel_publish");
 }