diff --git a/dap-sdk b/dap-sdk index 0809235356b18200560c866e95294cda39ff3a68..188dd5b6c0dca38a173d1dcc3413f562dfa3c920 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 0809235356b18200560c866e95294cda39ff3a68 +Subproject commit 188dd5b6c0dca38a173d1dcc3413f562dfa3c920 diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c index 99484040afdbafea0b96c545aa5140b59a76b1e8..13e8e6799b7d008016f7568a017bd098f96435bc 100644 --- a/modules/net/dap_chain_node_cli.c +++ b/modules/net/dap_chain_node_cli.c @@ -342,6 +342,9 @@ int dap_chain_node_cli_init(dap_config_t * g_config) "decree info -net <net_name>\n" "Displays information about the parameters of the decrees in the network.\n"); + dap_cli_server_cmd_add ("exit", com_exec_cmd, "Execute command on remote node", + "exec_cmd -net <net_name> -addr <node_addr> -cmd <command,and,all,args,separated,by,commas>\n" ); + // Exit - always last! dap_cli_server_cmd_add ("exit", com_exit, "Stop application and exit", "exit\n" ); diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c index 2aa446bd15e95d5425477696196e8a9ec6aee3a4..66ef5a56593a389c72d4a12fce3540efee6a4824 100644 --- a/modules/net/dap_chain_node_cli_cmd.c +++ b/modules/net/dap_chain_node_cli_cmd.c @@ -103,6 +103,8 @@ #include "dap_json_rpc_errors.h" #include "dap_http_ban_list_client.h" #include "dap_chain_datum_tx_voting.h" +#include "dap_json_rpc.h" +#include "dap_json_rpc_request.h" #define LOG_TAG "chain_node_cli_cmd" @@ -8538,3 +8540,44 @@ void dap_notify_new_client_send_info(dap_events_socket_t *a_es, UNUSED_ARG void } json_object_put(l_json_wallets); } + +int com_exec_cmd(int argc, char **argv, void **reply) { + json_object ** a_json_arr_reply = (json_object **) reply; + if (!dap_json_rpc_exec_cmd_inited()) { + log_it(L_ERROR, "Json-rpc module doesn't inited, check confings"); + return -1; + } + + const char * l_cmd_arg_str = NULL, * l_ip_str = NULL, * l_net_str = NULL; + int arg_index = 1; + dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-cmd", &l_cmd_arg_str); + dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-addr", &l_ip_str); + dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-net", &l_net_str); + if (!l_cmd_arg_str || ! l_ip_str || !l_net_str) { + dap_json_rpc_error_add(-1, "Command exec_cmd require args -cmd, -addr, -net"); + } + dap_chain_net_t* l_net = NULL; + l_net = dap_chain_net_by_name(l_net_str); + + dap_json_rpc_params_t * params = dap_json_rpc_params_create(); + char *l_cmd_str = dap_strdup(l_cmd_arg_str); + for(int i = 0; l_cmd_str[i] != '\0'; i++) { + if (l_cmd_str[i] == ',') + l_cmd_str[i] = ';'; + } + dap_json_rpc_params_add_data(params, l_cmd_str, TYPE_PARAM_STRING); + uint64_t l_id_response = dap_json_rpc_response_get_new_id(); + char ** l_cmd_arr_str = dap_strsplit(l_cmd_str, ";", -1); + dap_json_rpc_request_t *a_request = dap_json_rpc_request_creation(l_cmd_arr_str[0], params, l_id_response); + dap_strfreev(l_cmd_arr_str); + // char * request_str = dap_json_rpc_request_to_json_string(a_request); + dap_chain_node_addr_t l_node_addr; + dap_chain_node_addr_from_str(&l_node_addr, l_ip_str); + dap_chain_node_info_t *l_remote = dap_chain_node_info_read(l_net, &l_node_addr); + DAP_DEL_Z(l_cmd_str); + if (!dap_json_rpc_request_send(a_request, dap_json_rpc_response_accepted, l_remote->ext_host, l_remote->ext_port, dap_json_rpc_error_callback)) + log_it(L_INFO, "com_exec sent request to %s:%d", l_remote->ext_host, l_remote->ext_port); + + json_object_array_add(*a_json_arr_reply, json_object_new_string("DONE")); + return 0; +} diff --git a/modules/net/include/dap_chain_node_cli_cmd.h b/modules/net/include/dap_chain_node_cli_cmd.h index bf894e41236abcffc9815d3fa6984d4f17ae755c..cb6e5eb6c14fbc82e41a9ba1f59b0b300f9cc973 100644 --- a/modules/net/include/dap_chain_node_cli_cmd.h +++ b/modules/net/include/dap_chain_node_cli_cmd.h @@ -363,3 +363,5 @@ int com_signer(int a_argc, char **a_argv, void **a_str_reply); int cmd_remove(int a_argc, char **a_argv, void **a_str_reply); void dap_notify_new_client_send_info(dap_events_socket_t *a_es, void *a_arg); + +int com_exec_cmd(int argc, char **argv, void **reply);