From cae053a1090ec2e2bbc4ad48d6d5dae8e3617565 Mon Sep 17 00:00:00 2001 From: Abhay agarwal Date: Wed, 4 Dec 2019 14:20:22 +0530 Subject: [PATCH] Fix device payload insert Signed-off-by: Abhay agarwal --- ua-api/src/ua-api.c | 9 ++++----- ua-daemon/src/ua-manager-payload-db.c | 5 ++++- ua-daemon/src/ua-manager-request-handler.c | 17 ++++++++++------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ua-api/src/ua-api.c b/ua-api/src/ua-api.c index 4ca2a7d..ed751e7 100644 --- a/ua-api/src/ua-api.c +++ b/ua-api/src/ua-api.c @@ -1456,8 +1456,8 @@ UAM_EXPORT_API int _uam_request_add_payload(uam_ble_payload_s *payload, g_array_append_vals(in_param2, str, sizeof(str)); g_array_append_vals(in_param3, &tech_type, sizeof(int)); - ret = _uam_async_request(UAM_REQUEST_ADD_PAYLOAD, in_param1, in_param2, - in_param3, in_param4, cb_info.callback, cb_info.user_data); + ret = _uam_sync_request(UAM_REQUEST_ADD_PAYLOAD, + in_param1, in_param2, in_param3, in_param4, &out_param); UAM_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -1483,9 +1483,8 @@ UAM_EXPORT_API int _uam_service_add_payload(const char *service, g_array_append_vals(in_param2, payload, sizeof(uam_ble_payload_s)); - ret = _uam_async_request(UAM_REQUEST_ADD_PAYLOAD_TO_SERVICE, - in_param1, in_param2, in_param3, in_param4, - cb_info.callback, cb_info.user_data); + ret = _uam_sync_request(UAM_REQUEST_ADD_PAYLOAD_TO_SERVICE, + in_param1, in_param2, in_param3, in_param4, &out_param); UAM_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); diff --git a/ua-daemon/src/ua-manager-payload-db.c b/ua-daemon/src/ua-manager-payload-db.c index 1dbd1d0..f69af2a 100644 --- a/ua-daemon/src/ua-manager-payload-db.c +++ b/ua-daemon/src/ua-manager-payload-db.c @@ -280,7 +280,10 @@ int _uam_db_insert_payload_info( goto handle_error; } - UAM_DBG("Device-payload info inserted [%d] ", device_number); + UAM_DBG("Device-payload info inserted [%d] primary_key: [%d] " \ + "secondary_key: [%d] device_icon: [%d]", device_number, + payload->primary_key, payload->secondary_key, + payload->device_icon); handle_error: sqlite3_reset(stmt); diff --git a/ua-daemon/src/ua-manager-request-handler.c b/ua-daemon/src/ua-manager-request-handler.c index 5c1001f..c5133ec 100644 --- a/ua-daemon/src/ua-manager-request-handler.c +++ b/ua-daemon/src/ua-manager-request-handler.c @@ -691,30 +691,33 @@ static int __uam_manager_sync_request_handler( break; } case UAM_REQUEST_ADD_PAYLOAD: { - uam_ble_payload_s *payload; + uam_ble_payload_s payload; const char *device_id; int tech_type; - __uam_manager_copy_params(in_param1, &payload, sizeof(uam_ble_payload_s)); device_id = (char *)g_variant_get_data(in_param2); __uam_manager_copy_params(in_param3, &tech_type, sizeof(int)); + UAM_DBG("device_id: [%s], tech_type: %d", device_id, tech_type); + + __uam_manager_copy_params(in_param1, &payload, sizeof(uam_ble_payload_s)); + UAM_DBG("Payload primary key: [%d] device_id: [%s], tech_type: %d", - payload->primary_key, device_id, tech_type); + payload.primary_key, device_id, tech_type); - result = _uam_core_add_payload(payload, device_id, tech_type); + result = _uam_core_add_payload(&payload, device_id, tech_type); break; } case UAM_REQUEST_ADD_PAYLOAD_TO_SERVICE: { - uam_ble_payload_s *payload; + uam_ble_payload_s payload; const char *svc_name; svc_name = (char *)g_variant_get_data(in_param1); __uam_manager_copy_params(in_param2, &payload, sizeof(uam_ble_payload_s)); UAM_DBG("Payload primary key: [%d], Service [%s]", - payload->primary_key, svc_name); + payload.primary_key, svc_name); - result = _uam_core_service_add_payload(payload, svc_name); + result = _uam_core_service_add_payload(&payload, svc_name); break; } default: -- 2.7.4