Do not use wifi_aware_role_e as a parameter of wifi_aware_data_path_create()

diff --git a/include/wifi-aware.h b/include/wifi-aware.h
index 99cc282..0717038 100644 (file)
--- a/include/wifi-aware.h
+++ b/include/wifi-aware.h
@@ -593,11 +593,6 @@ typedef enum {
 } wifi_aware_security_type_e;
 
 typedef enum {
-       WIFI_AWARE_DATA_PATH_INITIATOR,
-       WIFI_AWARE_DATA_PATH_RESPONDER,
-} wifi_aware_data_path_role_e;
-
-typedef enum {
        WIFI_AWARE_TERMINATION_REASON_UNKNOWN = 0,
 } wifi_aware_termination_reason_e;
 
@@ -606,11 +601,10 @@ typedef enum {
  * @since_tizen 6.0
  * @param[in] session
  * @param[in] peer
- * @param[in] role
  * @param[out] data_path
  */
 int wifi_aware_data_path_create(wifi_aware_session_h session, wifi_aware_peer_h peer,
-               wifi_aware_data_path_role_e role, wifi_aware_data_path_h *data_path);
+               wifi_aware_data_path_h *data_path);
 
 /**
  * @brief Set a security type
@@ -639,7 +633,6 @@ int wifi_aware_data_path_set_pmk(wifi_aware_data_path_h data_path, const unsigne
 // only for responder
 /**
  * @brief Set a service specific information which is contained in Data Path Response Frame.
- * @remarks The service specific information can be set only when the role is WIFI_AWARE_DATA_PATH_RESPONDER.
  * @since_tizen 6.0
  * @param[in] data_path
  * @param[in] service_specific_info

diff --git a/src/include/wifi-aware-data-path.h b/src/include/wifi-aware-data-path.h
index 61b9d46..eebc783 100644 (file)
--- a/src/include/wifi-aware-data-path.h
+++ b/src/include/wifi-aware-data-path.h
@@ -31,8 +31,13 @@ extern "C" {
 #define WIFI_AWARE_MAX_PSK_LEN 63
 #define WIFI_AWARE_PMK_LEN 32
 
+typedef enum {
+       WIFI_AWARE_DATA_PATH_INITIATOR,
+       WIFI_AWARE_DATA_PATH_RESPONDER,
+} wifi_aware_data_path_role_e;
+
 int _wifi_aware_data_path_handle_create(wifi_aware_session_h session, wifi_aware_peer_h peer,
-               wifi_aware_data_path_role_e role, wifi_aware_data_path_h *data_path);
+               wifi_aware_data_path_h *data_path);
 int _wifi_aware_data_path_set_security(wifi_aware_data_path_h data_path,
                wifi_aware_security_type_e security_type);
 int _wifi_aware_data_path_set_psk(wifi_aware_data_path_h data_path, const char *key);

diff --git a/src/include/wifi-aware-gdbus.h b/src/include/wifi-aware-gdbus.h
index 13cd42b..c9fa22a 100644 (file)
--- a/src/include/wifi-aware-gdbus.h
+++ b/src/include/wifi-aware-gdbus.h
@@ -23,6 +23,7 @@
 #include <tizen.h>
 #include "wifi-aware.h"
 #include "wifi-aware-config.h"
+#include "wifi-aware-data-path.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/include/wifi-aware-private.h b/src/include/wifi-aware-private.h
index 6a1823d..79bcffb 100644 (file)
--- a/src/include/wifi-aware-private.h
+++ b/src/include/wifi-aware-private.h
@@ -40,8 +40,9 @@ int _wifi_aware_disable_request();
 
 int _wifi_aware_session_handle_create(wifi_aware_session_type_e session_type, wifi_aware_session_h *session_handle);
 void _wifi_aware_session_handle_destroy(wifi_aware_session_h session_handle);
-wifi_aware_session_type_e _wifi_aware_session_get_type(wifi_aware_session_h session_handle);
 uint16_t _wifi_aware_session_get_pub_sub_id(wifi_aware_session_h session);
+bool _wifi_aware_session_is_publish_type(wifi_aware_session_h session_handle);
+bool _wifi_aware_session_is_subscribe_type(wifi_aware_session_h session_handle);
 
 int _wifi_aware_publish_handle_create(wifi_aware_publish_h *publish);
 void _wifi_aware_publish_set_default_values(wifi_aware_publish_h publish);

diff --git a/src/wifi-aware-data-path.c b/src/wifi-aware-data-path.c
index 1368aac..a6cd345 100644 (file)
--- a/src/wifi-aware-data-path.c
+++ b/src/wifi-aware-data-path.c
@@ -59,11 +59,6 @@ typedef struct {
        bool is_open;
 } wifi_aware_data_path_s;
 
-static bool __is_valid_data_path_role(wifi_aware_data_path_role_e role)
-{
-       return role >= WIFI_AWARE_DATA_PATH_INITIATOR && role <= WIFI_AWARE_DATA_PATH_RESPONDER;
-}
-
 static bool __is_valid_wifi_aware_security_type(wifi_aware_security_type_e security_type)
 {
        return security_type >= WIFI_AWARE_SECURITY_TYPE_OPEN
@@ -95,7 +90,7 @@ static void __data_path_close(wifi_aware_data_path_h data_path)
 }
 
 int _wifi_aware_data_path_handle_create(wifi_aware_session_h session, wifi_aware_peer_h peer,
-               wifi_aware_data_path_role_e role, wifi_aware_data_path_h *data_path)
+               wifi_aware_data_path_h *data_path)
 {
        __WIFI_AWARE_FUNC_ENTER__;
 
@@ -103,15 +98,15 @@ int _wifi_aware_data_path_handle_create(wifi_aware_session_h session, wifi_aware
        RET_VAL_IF(peer == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "peer is NULL");
        RET_VAL_IF(data_path == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "data_path is NULL");
 
-       RET_VAL_IF(!__is_valid_data_path_role(role), WIFI_AWARE_ERROR_INVALID_PARAMETER,
-                       "data_path_role is not valid");
-
        wifi_aware_data_path_s *ndp =
                (wifi_aware_data_path_s *)g_try_malloc0(sizeof(wifi_aware_data_path_s));
        RET_VAL_IF(ndp == NULL, WIFI_AWARE_ERROR_OUT_OF_MEMORY, "Out of memory");
 
        *data_path = (wifi_aware_data_path_h)ndp;
-       ndp->role = role;
+       if (_wifi_aware_session_is_publish_type(session))
+               ndp->role = WIFI_AWARE_DATA_PATH_RESPONDER;
+       else
+               ndp->role = WIFI_AWARE_DATA_PATH_INITIATOR;
 
        return WIFI_AWARE_ERROR_NONE;
 }

diff --git a/src/wifi-aware-private.c b/src/wifi-aware-private.c
index 8225fa6..bd15897 100644 (file)
--- a/src/wifi-aware-private.c
+++ b/src/wifi-aware-private.c
@@ -193,18 +193,6 @@ static int __get_client_id()
        return g_wifi_aware->client_id;
 }
 
-static int __is_publish_session(wifi_aware_session_h session_handle)
-{
-       wifi_aware_session_s *session = (wifi_aware_session_s *)session_handle;
-       return session->session_type == WIFI_AWARE_SESSION_PUBLISH;
-}
-
-static int __is_subscribe_session(wifi_aware_session_h session_handle)
-{
-       wifi_aware_session_s *session = (wifi_aware_session_s *)session_handle;
-       return session->session_type == WIFI_AWARE_SESSION_SUBSCRIBE;
-}
-
 static void __session_deregister_signals(wifi_aware_session_h session)
 {
        _wifi_aware_unset_service_discovered_cb(session);
@@ -373,7 +361,7 @@ static void __subscribe_request_reply(GObject *src, GAsyncResult *res, gpointer
 uint16_t _wifi_aware_session_get_publish_id(wifi_aware_session_h session)
 {
        RET_VAL_IF(session == NULL, 0, "wifi_aware_session_h is NULL");
-       RET_VAL_IF(!__is_publish_session(session), 0,
+       RET_VAL_IF(!_wifi_aware_session_is_publish_type(session), 0,
                        "This session is not for Publish");
        return _wifi_aware_session_get_pub_sub_id(session);
 }
@@ -381,7 +369,7 @@ uint16_t _wifi_aware_session_get_publish_id(wifi_aware_session_h session)
 uint16_t _wifi_aware_session_get_subscribe_id(wifi_aware_session_h session)
 {
        RET_VAL_IF(session == NULL, 0, "wifi_aware_session_h is NULL");
-       RET_VAL_IF(!__is_subscribe_session(session), 0,
+       RET_VAL_IF(!_wifi_aware_session_is_subscribe_type(session), 0,
                        "This session is not for Subscribe");
        return _wifi_aware_session_get_pub_sub_id(session);
 }
@@ -392,6 +380,18 @@ uint16_t _wifi_aware_session_get_pub_sub_id(wifi_aware_session_h session)
        return handle->pub_sub_id;
 }
 
+bool _wifi_aware_session_is_publish_type(wifi_aware_session_h session_handle)
+{
+       wifi_aware_session_s *session = (wifi_aware_session_s *)session_handle;
+       return session->session_type == WIFI_AWARE_SESSION_PUBLISH;
+}
+
+bool _wifi_aware_session_is_subscribe_type(wifi_aware_session_h session_handle)
+{
+       wifi_aware_session_s *session = (wifi_aware_session_s *)session_handle;
+       return session->session_type == WIFI_AWARE_SESSION_SUBSCRIBE;
+}
+
 static int __wifi_aware_create()
 {
        g_wifi_aware = (wifi_aware_s *)g_try_malloc0(sizeof(wifi_aware_s));
@@ -596,7 +596,7 @@ int _wifi_aware_publish_request(wifi_aware_session_h session,
 {
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
        RET_VAL_IF(publish == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_publish_h is NULL");
-       RET_VAL_IF(!__is_publish_session(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
+       RET_VAL_IF(!_wifi_aware_session_is_publish_type(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "This session is not for Publish");
        RET_VAL_IF(__session_is_requested(session), WIFI_AWARE_ERROR_NOW_IN_PROGRESS,
                        "There is a pending request");
@@ -625,7 +625,7 @@ int _wifi_aware_update_publish_request(wifi_aware_session_h session,
 {
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
        RET_VAL_IF(publish == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_publish_h is NULL");
-       RET_VAL_IF(!__is_publish_session(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
+       RET_VAL_IF(!_wifi_aware_session_is_publish_type(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "This session is not for Publish");
        RET_VAL_IF(!__is_published(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "The publish is not done yet");
@@ -732,7 +732,7 @@ int _wifi_aware_subscribe_request(wifi_aware_session_h session,
        __WIFI_AWARE_FUNC_ENTER__;
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
        RET_VAL_IF(subscribe == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_subscribe_h is NULL");
-       RET_VAL_IF(!__is_subscribe_session(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
+       RET_VAL_IF(!_wifi_aware_session_is_subscribe_type(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "This session is not for Subscribe");
        RET_VAL_IF(__session_is_requested(session), WIFI_AWARE_ERROR_NOW_IN_PROGRESS,
                        "There is a pending request");
@@ -762,7 +762,7 @@ int _wifi_aware_update_subscribe_request(wifi_aware_session_h session,
        __WIFI_AWARE_FUNC_ENTER__;
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
        RET_VAL_IF(subscribe == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_subscribe_h is NULL");
-       RET_VAL_IF(!__is_subscribe_session(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
+       RET_VAL_IF(!_wifi_aware_session_is_subscribe_type(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "This session is not for Subscribe");
        RET_VAL_IF(!__is_subscribed(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "The subscribe is not done yet");
@@ -791,7 +791,7 @@ static int __wifi_aware_cancel_publish_request(wifi_aware_session_h session)
 {
        __WIFI_AWARE_FUNC_ENTER__;
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
-       RET_VAL_IF(!__is_publish_session(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
+       RET_VAL_IF(!_wifi_aware_session_is_publish_type(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "This session is not for Publish");
        RET_VAL_IF(!__is_published(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "The publish is not done yet");
@@ -804,7 +804,7 @@ static int __wifi_aware_cancel_subscribe_request(wifi_aware_session_h session)
 {
        __WIFI_AWARE_FUNC_ENTER__;
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
-       RET_VAL_IF(!__is_subscribe_session(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
+       RET_VAL_IF(!_wifi_aware_session_is_subscribe_type(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "This session is not for Subscribe");
        RET_VAL_IF(!__is_subscribed(session), WIFI_AWARE_ERROR_INVALID_OPERATION,
                        "The subscribe is not done yet");
@@ -818,11 +818,11 @@ int _wifi_aware_session_cancel(wifi_aware_session_h session)
 {
        __WIFI_AWARE_FUNC_ENTER__;
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
-       if (__is_publish_session(session)) {
+       if (_wifi_aware_session_is_publish_type(session)) {
                WIFI_AWARE_LOGD("Stop publish session");
                return __wifi_aware_cancel_publish_request(session);
        }
-       if (__is_subscribe_session(session)) {
+       if (_wifi_aware_session_is_subscribe_type(session)) {
                WIFI_AWARE_LOGD("Stop subscribe session");
                return __wifi_aware_cancel_subscribe_request(session);
        }
@@ -890,7 +890,7 @@ static void __service_discovered_cb(GDBusConnection *connection,
        wifi_aware_session_h session = (wifi_aware_session_h)user_data;
        wifi_aware_peer_h peer = NULL;
 
-       RET_IF(!__is_subscribe_session(session), "This session is not for Subscribe");
+       RET_IF(!_wifi_aware_session_is_subscribe_type(session), "This session is not for Subscribe");
 
        __parsing_service_discovered_event(parameters,
                        &sub_id, &peer_id,
@@ -926,7 +926,7 @@ static void __message_received_cb(GDBusConnection *connection,
        wifi_aware_session_h session = (wifi_aware_session_h)user_data;
        wifi_aware_peer_h peer = NULL;
 
-       RET_IF(!__is_subscribe_session(session), "This session is not for Subscribe");
+       RET_IF(!_wifi_aware_session_is_subscribe_type(session), "This session is not for Subscribe");
 
        __parsing_message_received_event(parameters, &peer_id,
                        message, &message_len);
@@ -945,7 +945,7 @@ void _wifi_aware_set_service_discovered_cb(wifi_aware_session_h session,
 {
        __WIFI_AWARE_FUNC_ENTER__;
        RET_IF(session == NULL, "wifi_aware_session_h is NULL");
-       RET_IF(!__is_subscribe_session(session), "This session is not for Subscribe");
+       RET_IF(!_wifi_aware_session_is_subscribe_type(session), "This session is not for Subscribe");
 
     wifi_aware_session_s *handle = (wifi_aware_session_s *)session;
        handle->discovered_cb = callback;
@@ -958,7 +958,7 @@ void _wifi_aware_unset_service_discovered_cb(wifi_aware_session_h session)
 {
        __WIFI_AWARE_FUNC_ENTER__;
        RET_IF(session == NULL, "wifi_aware_session_h is NULL");
-       RET_IF(!__is_subscribe_session(session), "This session is not for Subscribe");
+       RET_IF(!_wifi_aware_session_is_subscribe_type(session), "This session is not for Subscribe");
 
     wifi_aware_session_s *handle = (wifi_aware_session_s *)session;
        handle->discovered_cb = NULL;

diff --git a/src/wifi-aware.c b/src/wifi-aware.c
index 23fd110..c574272 100644 (file)
--- a/src/wifi-aware.c
+++ b/src/wifi-aware.c
@@ -563,7 +563,7 @@ API int wifi_aware_unset_message_received_cb(wifi_aware_session_h session)
 }
 
 API int wifi_aware_data_path_create(wifi_aware_session_h session, wifi_aware_peer_h peer,
-               wifi_aware_data_path_role_e role, wifi_aware_data_path_h *data_path)
+               wifi_aware_data_path_h *data_path)
 {
        int ret = WIFI_AWARE_ERROR_NONE;
 
@@ -574,7 +574,7 @@ API int wifi_aware_data_path_create(wifi_aware_session_h session, wifi_aware_pee
        RET_VAL_IF(peer == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "Peer is NULL");
        RET_VAL_IF(data_path == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "Data path is NULL");
 
-       ret = _wifi_aware_data_path_handle_create(session, peer, role, data_path);
+       ret = _wifi_aware_data_path_handle_create(session, peer, data_path);
        RET_VAL_IF(ret != WIFI_AWARE_ERROR_NONE, ret, "Fail to create data path handle");
        WIFI_AWARE_LOGD("data path handle: %p", *data_path);
 

diff --git a/test/wifi-aware-test.c b/test/wifi-aware-test.c
index 6877b4b..c9419d4 100644 (file)
--- a/test/wifi-aware-test.c
+++ b/test/wifi-aware-test.c
@@ -262,7 +262,7 @@ static void __print_result(int ret, gchar *function_name)
     printf("%s() result=[%d]\n", function_name, ret);
 }
 
-void __print_byte_array(unsigned char *data, size_t len)
+void __print_byte_array(const unsigned char *data, size_t len)
 {
        const unsigned char *ptr = data;
        const unsigned char *max = data + len;
@@ -529,7 +529,7 @@ static void __subscribed_cb(wifi_aware_session_h session,
 
 static void __service_discovered_cb(wifi_aware_session_h session,
                wifi_aware_peer_h peer,
-               unsigned char *service_specific_info, size_t service_specific_info_len,
+               const unsigned char *service_specific_info, size_t service_specific_info_len,
                void *user_data)
 {
        printf("Find A Wi-Fi Aware Peer\n");