From 7d78cb0bbf93d72e462b728e9af6d71e177902f9 Mon Sep 17 00:00:00 2001 From: Cheoleun Moon Date: Thu, 19 Mar 2020 21:21:24 +0900 Subject: [PATCH] Add a nan erro WIFI_AWARE_ERROR_REJECTED_BY_PEER --- include/wifi-aware.h | 4 ++++ src/wifi-aware-data-path.c | 2 +- src/wifi-aware-gdbus.c | 1 + src/wifi-aware-private.c | 5 +++++ test/wifi-aware-publish-test.c | 6 +++++- test/wifi-aware-subscribe-test.c | 16 ++++++++++------ test/wifi-aware-test.c | 4 +++- 7 files changed, 29 insertions(+), 9 deletions(-) diff --git a/include/wifi-aware.h b/include/wifi-aware.h index 86c958b..86da22f 100644 --- a/include/wifi-aware.h +++ b/include/wifi-aware.h @@ -94,6 +94,10 @@ typedef enum { * Operation failed */ WIFI_AWARE_ERROR_OPERATION_FAILED = TIZEN_ERROR_WIFI_AWARE|0x03, + /** + * Rejected by peer + */ + WIFI_AWARE_ERROR_REJECTED_BY_PEER = TIZEN_ERROR_WIFI_AWARE|0x04, } wifi_aware_error_e; typedef enum { diff --git a/src/wifi-aware-data-path.c b/src/wifi-aware-data-path.c index cf93e0b..4d9d425 100644 --- a/src/wifi-aware-data-path.c +++ b/src/wifi-aware-data-path.c @@ -228,7 +228,7 @@ static wifi_aware_error_e __parsing_data_path_confirmed_event(GVariant *paramete gchar *ip = NULL; wifi_aware_data_path_s *ndp = (wifi_aware_data_path_s *)data_path; - g_variant_get(parameters, "(ussii)", &ndp->ndp_id, &iface, &ip, &ndp->peer_port, nan_error); + g_variant_get(parameters, "(ussii)", &ndp->ndp_id, &iface, &ip, &ndp->peer_port, &nan_error); error = _wifi_aware_convert_nan_manager_error(nan_error); if (error == WIFI_AWARE_ERROR_NONE) { strncpy(ndp->iface_name, iface, IFNAMSIZ); diff --git a/src/wifi-aware-gdbus.c b/src/wifi-aware-gdbus.c index a97a7fc..0b1b726 100644 --- a/src/wifi-aware-gdbus.c +++ b/src/wifi-aware-gdbus.c @@ -75,6 +75,7 @@ guint wifi_aware_gdbus_register_signal(wifi_aware_signal_e signal, GDBusSignalCallback callback, void *user_data) { __WIFI_AWARE_FUNC_ENTER__; + WIFI_AWARE_LOGD("Register signal %s", wifi_aware_gdbus_signal_map[signal].member); return g_dbus_connection_signal_subscribe( gdbus_data.connection, diff --git a/src/wifi-aware-private.c b/src/wifi-aware-private.c index b5ab9ef..d2b91b0 100644 --- a/src/wifi-aware-private.c +++ b/src/wifi-aware-private.c @@ -51,6 +51,7 @@ enum { NAN_ERROR_ALREADY_ENABLED, NAN_ERROR_NO_CLIENT, NAN_ERROR_TOO_MANY_REQUESTS, + NAN_ERROR_REJECTED_BY_PEER, NAN_ERROR_UNKNOWN, } nan_manager_error_e; @@ -122,6 +123,8 @@ const char *_wifi_aware_convert_error_type_to_string(wifi_aware_error_e err) return "Not Initialized"; case WIFI_AWARE_ERROR_ALREADY_INITIALIZED: return "Already Initialized"; + case WIFI_AWARE_ERROR_REJECTED_BY_PEER: + return "Rejected by peer"; default: return "Unknown error"; } @@ -174,6 +177,8 @@ wifi_aware_error_e _wifi_aware_convert_nan_manager_error(int error) return WIFI_AWARE_ERROR_OPERATION_FAILED; case NAN_ERROR_TOO_MANY_REQUESTS: return WIFI_AWARE_ERROR_RESOURCE_BUSY; + case NAN_ERROR_REJECTED_BY_PEER: + return WIFI_AWARE_ERROR_REJECTED_BY_PEER; case NAN_ERROR_UNKNOWN: default: return WIFI_AWARE_ERROR_OPERATION_FAILED; diff --git a/test/wifi-aware-publish-test.c b/test/wifi-aware-publish-test.c index 36a3221..674b33f 100644 --- a/test/wifi-aware-publish-test.c +++ b/test/wifi-aware-publish-test.c @@ -156,6 +156,8 @@ static inline int __is_digit(const char* str) const char *__print_error(wifi_aware_error_e err) { switch (err) { + case WIFI_AWARE_ERROR_NONE: + return "NO ERROR"; case WIFI_AWARE_ERROR_NOT_PERMITTED: return "NOT_PERMITTED"; case WIFI_AWARE_ERROR_OUT_OF_MEMORY: @@ -176,6 +178,8 @@ const char *__print_error(wifi_aware_error_e err) return "NOT_INITIALIZED"; case WIFI_AWARE_ERROR_ALREADY_INITIALIZED: return "ALREADY_INITIALIZED"; + case WIFI_AWARE_ERROR_REJECTED_BY_PEER: + return "REJECTED_BY_PEER"; default: return "UNKNOWN"; } @@ -277,7 +281,7 @@ static void __open_cb(wifi_aware_data_path_h data_path, wifi_aware_error_e error printf("Fail to get Port number\n"); } else { - printf("\n>>Fail to open Data path. data path: %p\n", data_path); + printf("\n>>Fail to open Data path. data path: %p. error: %s\n", data_path, __print_error(error)); } } diff --git a/test/wifi-aware-subscribe-test.c b/test/wifi-aware-subscribe-test.c index 0d580af..a1c0cd2 100644 --- a/test/wifi-aware-subscribe-test.c +++ b/test/wifi-aware-subscribe-test.c @@ -81,7 +81,7 @@ #define MAX_SPECIFIC_INFO_LEN 1024 #define MAX_PSK_LEN 63 -#define PSK "AABBCCDDEE" +#define PSK "11223344" #define IPV6_ADDRESS_LEN 39 enum { @@ -155,6 +155,8 @@ static inline int __is_digit(const char* str) const char *__print_error(wifi_aware_error_e err) { switch (err) { + case WIFI_AWARE_ERROR_NONE: + return "NO ERROR"; case WIFI_AWARE_ERROR_NOT_PERMITTED: return "NOT_PERMITTED"; case WIFI_AWARE_ERROR_OUT_OF_MEMORY: @@ -175,6 +177,8 @@ const char *__print_error(wifi_aware_error_e err) return "NOT_INITIALIZED"; case WIFI_AWARE_ERROR_ALREADY_INITIALIZED: return "ALREADY_INITIALIZED"; + case WIFI_AWARE_ERROR_REJECTED_BY_PEER: + return "REJECTED_BY_PEER"; default: return "UNKNOWN"; } @@ -232,10 +236,10 @@ static void __subscribed_cb(wifi_aware_session_h session, wifi_aware_error_e error, void *user_data) { if (error == WIFI_AWARE_ERROR_NONE) { - printf("Publish Request is success.\n"); + printf("Subscribe Request is success.\n"); } else { - printf("Publish Request fails. Error: %s\n", __print_error(error)); + printf("Subscribe Request fails. Error: %s\n", __print_error(error)); return; } } @@ -255,7 +259,7 @@ static void __open_cb(wifi_aware_data_path_h data_path, wifi_aware_error_e error if (error == WIFI_AWARE_ERROR_NONE) { int ret = WIFI_AWARE_ERROR_NONE; char *interface; - printf("\n>>Data path is created. NDP: %p\n", data_path); + printf("\n>>Data path is established. NDP: %p\n", data_path); ret = wifi_aware_data_path_get_interface(data_path, &interface); if (ret == WIFI_AWARE_ERROR_NONE) printf("Interface: %s\n", interface); @@ -276,7 +280,7 @@ static void __open_cb(wifi_aware_data_path_h data_path, wifi_aware_error_e error printf("Fail to get Port number\n"); } else { - printf("\n>>Fail to open Data path. data path: %p\n", data_path); + printf("\n>>Fail to open Data path. data path: %p. error: %s\n", data_path, __print_error(error)); } } @@ -332,7 +336,7 @@ static void __open_data_path(wifi_aware_session_h session) static void __message_result_cb(wifi_aware_session_h session, wifi_aware_error_e error, void *user_data) { - printf("\n>>Result of sending message: %s\n", __print_error(error)); + printf("\n>>Result of sending message: %d(%s)\n", error, __print_error(error)); } static void __message_received_cb(wifi_aware_session_h session, wifi_aware_peer_h peer, diff --git a/test/wifi-aware-test.c b/test/wifi-aware-test.c index d463c45..d945e35 100644 --- a/test/wifi-aware-test.c +++ b/test/wifi-aware-test.c @@ -280,6 +280,8 @@ const char *__print_error(wifi_aware_error_e err) return "NOT_INITIALIZED"; case WIFI_AWARE_ERROR_ALREADY_INITIALIZED: return "ALREADY_INITIALIZED"; + case WIFI_AWARE_ERROR_REJECTED_BY_PEER: + return "REJECTED_BY_PEER"; default: return "UNKNOWN"; } @@ -855,7 +857,7 @@ static void __open_cb(wifi_aware_data_path_h data_path, wifi_aware_error_e error } } else { - printf("Fail to open Data path. NDP: %p\n", data_path); + printf("\n>>Fail to open Data path. data path: %p. error: %s\n", data_path, __print_error(error)); } } -- 2.7.4