Replace wifi_aware_subscribe_config_h with wifi_aware_subscribe_h

diff --git a/src/include/wifi-aware-gdbus.h b/src/include/wifi-aware-gdbus.h
index aef7ae1..2c463d7 100644 (file)
--- a/src/include/wifi-aware-gdbus.h
+++ b/src/include/wifi-aware-gdbus.h
@@ -54,10 +54,8 @@ int wifi_aware_gdbus_enable(wifi_aware_h wifi_aware,
 int wifi_aware_gdbus_publish(wifi_aware_publish_h publish, int client_id, GAsyncReadyCallback cb);
 int wifi_aware_gdbus_cancel_publish(wifi_aware_publish_h publish, int client_id);
 int wifi_aware_gdbus_update_publish(wifi_aware_publish_h publish, int client_id, GAsyncReadyCallback cb);
-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,
-               unsigned int sub_id);
+int wifi_aware_gdbus_subscribe(wifi_aware_subscribe_h subscribe, int client_id, GAsyncReadyCallback cb);
+int wifi_aware_gdbus_cancel_subscribe(wifi_aware_subscribe_h subscribe, int client_id);
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/include/wifi-aware-private.h b/src/include/wifi-aware-private.h
index 4641bbe..b679977 100644 (file)
--- a/src/include/wifi-aware-private.h
+++ b/src/include/wifi-aware-private.h
@@ -44,9 +44,8 @@ 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, wifi_aware_publish_h publish);
 int _wifi_aware_update_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);
+int _wifi_aware_subscribe_request(wifi_aware_h wifi_aware, wifi_aware_subscribe_h subscribe);
+int _wifi_aware_cancel_subscribe_request(wifi_aware_h wifi_aware, wifi_aware_subscribe_h subscribe);
 
 void _set_discovery_result_cb(wifi_aware_h wifi_aware,
                wifi_aware_discovery_result_cb callback, void *user_data);

diff --git a/src/include/wifi-aware-subscribe-private.h b/src/include/wifi-aware-subscribe-private.h
new file mode 100644 (file)
index 0000000..eb7ef1b
--- /dev/null
+++ b/src/include/wifi-aware-subscribe-private.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+#ifndef __TIZEN_NET_WIFI_AWARE_SUBSCRIBE_PRIVATE_H__
+#define __TIZEN_NET_WIFI_AWARE_SUBSCRIBE_PRIVATE_H__
+
+#include <tizen.h>
+#include <gio/gio.h>
+
+#include "wifi-aware.h"
+#include "wifi-aware-config.h"
+#include "wifi-aware-log.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+wifi_aware_subscribe_request_s *_wifi_aware_subscribe_get_request(wifi_aware_subscribe_h subscribe_handle);
+unsigned int _wifi_aware_subscribe_get_id(wifi_aware_subscribe_h subscribe);
+void _wifi_aware_subscribe_set_id(wifi_aware_subscribe_h subscribe_handle, unsigned int subscribe_id);
+void _wifi_aware_subscribe_invoke_callback(wifi_aware_error_e error, wifi_aware_subscribe_h subscribe_handle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIZEN_NET_WIFI_AWARE_SUBSCRIBE_PRIVATE_H__ */