From b6dd87a23184cb74c24573f9c9d55b08818b36e7 Mon Sep 17 00:00:00 2001 From: Dohyun Pyun Date: Wed, 16 Aug 2023 08:07:15 +0900 Subject: [PATCH] Modify the parameter for Scan dbus API The parameter's type was changed in upstream. So we need to apply it. https://github.com/openthread/ot-br-posix/pull/1814 Change-Id: I0fb3d7c85e4d948707d0eb851eee95122fc734d7 Signed-off-by: Dohyun Pyun --- include/thread-type.h | 4 ++-- src/thread-util.c | 6 +++--- tests/thread-test/thread-core.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/thread-type.h b/include/thread-type.h index 6aa15ed..b903c58 100755 --- a/include/thread-type.h +++ b/include/thread-type.h @@ -167,8 +167,8 @@ typedef enum { */ typedef void (*thread_network_scan_result_cb)(int result, thread_network_scanning_state_e state, uint64_t ext_address, const char *network_name, uint64_t ext_panidi, - const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint16_t channel, - uint16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data); + const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint8_t channel, + int16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data); /** * @ingroup CAPI_NETWORK_THREAD_MODULE diff --git a/src/thread-util.c b/src/thread-util.c index 1265ee2..eab4752 100644 --- a/src/thread-util.c +++ b/src/thread-util.c @@ -152,7 +152,7 @@ void __thread_dbus_handle_scan_cb(gboolean res, uint16_t panid = 0; uint16_t joiner_udp_port = 0; uint8_t channel = 0; - uint8_t rssi = 0; + int16_t rssi = 0; uint8_t lqi = 0; uint8_t version = 0; bool is_native = 0; @@ -169,9 +169,9 @@ void __thread_dbus_handle_scan_cb(gboolean res, goto scan_finished; } - g_variant_get(val, "(a(tstayqqyyyybb))", &iter); + g_variant_get(val, "(a(tstayqqynyybb))", &iter); - while (g_variant_iter_loop(iter, "(t&stayqqyyyybb)", + while (g_variant_iter_loop(iter, "(t&stayqqynyybb)", &ext_address, &network_name, &ext_panid, &steering_data, &panid, &joiner_udp_port, &channel, &rssi, &lqi, &version, &is_native, &is_native)) { diff --git a/tests/thread-test/thread-core.c b/tests/thread-test/thread-core.c index 0cc7bd6..293f72c 100755 --- a/tests/thread-test/thread-core.c +++ b/tests/thread-test/thread-core.c @@ -45,8 +45,8 @@ static const char* g_uuid; static void __thread_scan_callback(int result, thread_network_scanning_state_e state, uint64_t ext_address, const char *network_name, uint64_t ext_panidi, - const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint16_t channel, - uint16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data) { + const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint8_t channel, + int16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data) { msg("Thread scan callback, result: %s", _thread_get_error_message(result)); -- 2.7.4