From 67b27b9e8a3b94102bd535233ab70b6ffffbb300 Mon Sep 17 00:00:00 2001 From: Olzhas <oljas.jarasbaev@demlabs.net> Date: Tue, 22 Oct 2024 16:40:39 +0700 Subject: [PATCH] [*] refactor --- modules/net/dap_chain_node_cli_cmd.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c index eb39d5604e..f6b4ddb1b9 100644 --- a/modules/net/dap_chain_node_cli_cmd.c +++ b/modules/net/dap_chain_node_cli_cmd.c @@ -8602,14 +8602,22 @@ int com_exec_cmd(int argc, char **argv, void **reply) { //wait handshake int res = dap_chain_node_client_wait(l_node_client, NODE_CLIENT_STATE_ESTABLISHED, timeout_ms); if (res) { - // dap_cli_server_cmd_set_reply_text(a_str_reply, "No response from node"); - // clean client struct + log_it(L_ERROR, "No response from node"); + dap_json_rpc_error_add(-8, "No reponse from node"); dap_chain_node_client_close_unsafe(l_node_client); DAP_DELETE(node_info); return -8; } + + //send response char * l_response = NULL; - dap_json_rpc_request_send(l_client_internal, l_request, l_response); - json_object_array_add(*a_json_arr_reply, json_object_new_string(l_response)); + dap_json_rpc_request_send(l_client_internal, l_request, &l_response); + + if (l_response) { + json_object * l_json_response = json_tokener_parse(l_response); + json_object_array_add(*a_json_arr_reply, l_json_response); + } else { + json_object_array_add(*a_json_arr_reply, json_object_new_string("Empty reply")); + } return 0; } -- GitLab