diff --git a/dap_chain_node_cli.c b/dap_chain_node_cli.c
index b911c2d092f56d30eec1853e6e045356bff4dc5c..36c6f46e3545bdea3a5d6105ed502b4a24358da6 100755
--- a/dap_chain_node_cli.c
+++ b/dap_chain_node_cli.c
@@ -278,8 +278,7 @@ static void* thread_one_client_func(void *args)
dap_chain_node_cmd_item_t *l_cmd = dap_chain_node_cli_cmd_find(cmd_name);
int res = -1;
char *str_reply = NULL;
- if(l_cmd)
- {
+ if(l_cmd){
while(list) {
str_cmd = dap_strdup_printf("%s;%s", str_cmd, list->data);
list = dap_list_next(list);
@@ -291,14 +290,15 @@ static void* thread_one_client_func(void *args)
// Call the command function
if(l_cmd && l_cmd->func)
res = (*(l_cmd->func))(argc, (const char **) argv, &str_reply);
+ else {
+ log_it(L_WARNING,"No function for command \"%s\" but it registred?!", str_cmd);
+ }
dap_strfreev(argv);
- }
- else
- {
+ } else {
str_reply = dap_strdup_printf("can't recognize command=%s", str_cmd);
log_it(L_ERROR, str_reply);
}
- char *reply_body = dap_strdup_printf("%d\r\n%s\r\n", res, (str_reply) ? str_reply : "");
+ char *reply_body = dap_strdup_printf("ret_code: %d\r\n%s\r\n", res, (str_reply) ? str_reply : "");
// return the result of the command function
char *reply_str = dap_strdup_printf("HTTP/1.1 200 OK\r\nContent-Length: %d\r\n\r\n%s",
strlen(reply_body), reply_body);
@@ -452,37 +452,43 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
//server.sun_family = AF_UNIX;
//strcpy(server.sun_path, SOCKET_FILE);
dap_chain_node_cli_cmd_item_create ("global_db", com_global_db, "Work with global database",
- "global_db wallet_info set -addr <wallet address> -cell <cell id> \n"
- "global_db cells add -cell <cell id> \n"
- "global_db node add -addr {<node address> | -alias <node alias>} -cell <cell id> {-ipv4 <ipv4 external address> | -ipv6 <ipv6 external address>}\n"
- "global_db node del -addr <node address> | -alias <node alias>\n"
- "global_db node link {add|del} {-addr <node address> | -alias <node alias>} -link <node address>\n"
- "global_db node dump\n"
- "global_db node dump -addr <node address> | -alias <node alias>\n"
- "global_db node get\n"
- "global_db node set -addr <node address> | -alias <node alias>\n"
- "global_db node remote_set -addr <node address> | -alias <node alias>");
+ "global_db wallet_info set -addr <wallet address> -cell <cell id> \n\n"
+ "global_db cells add -cell <cell id> \n\n"
+ "global_db node add -addr {<node address> | -alias <node alias>} -cell <cell id> {-ipv4 <ipv4 external address> | -ipv6 <ipv6 external address>}\n\n"
+ "global_db node del -addr <node address> | -alias <node alias>\n\n"
+ "global_db node link {add|del} {-addr <node address> | -alias <node alias>} -link <node address>\n\n"
+ "global_db node dump\n\n"
+ "global_db node dump -addr <node address> | -alias <node alias>\n\n"
+ "global_db node get\n\n"
+ "global_db node set -addr <node address> | -alias <node alias>\n\n"
+ "global_db node remote_set -addr <node address> | -alias <node alias>\n");
dap_chain_node_cli_cmd_item_create ("node", com_node, "Work with node",
- "node alias {<node address> | -alias <node alias>}\n"
- "node connect {<node address> | -alias <node alias>}\n"
- "node handshake {<node address> | -alias <node alias>}");
+ "node alias {<node address> | -alias <node alias>}\n\n"
+ "node connect {<node address> | -alias <node alias>}\n\n"
+ "node handshake {<node address> | -alias <node alias>}\n");
dap_chain_node_cli_cmd_item_create ("ping", com_ping, "Send ICMP ECHO_REQUEST to network hosts",
- "ping [-c <count>] host");
+ "ping [-c <count>] host\n");
dap_chain_node_cli_cmd_item_create ("traceroute", com_traceroute, "Print the hops and time of packets trace to network host",
- "traceroute host");
+ "traceroute host\n");
dap_chain_node_cli_cmd_item_create ("tracepath", com_tracepath, "Traces path to a network host along this path",
- "tracepath host");
- dap_chain_node_cli_cmd_item_create ("help", com_help, "Description of command parameters", "");
- dap_chain_node_cli_cmd_item_create ("?", com_help, "Synonym for 'help'", "");
- dap_chain_node_cli_cmd_item_create ("wallet", com_tx_wallet, "Wallet info", "wallet [list | info -addr <addr> -w <wallet_name>]");
+ "tracepath host\n");
+ dap_chain_node_cli_cmd_item_create ("help", com_help, "Description of command parameters",
+ "help [<command>]\n"
+ "\tObtain help for <command> or get the total list of the commands\n"
+ );
+ dap_chain_node_cli_cmd_item_create ("?", com_help, "Synonym for \"help\"",
+ "? [<command>]\n"
+ "\tObtain help for <command> or get the total list of the commands\n"
+ );
+ dap_chain_node_cli_cmd_item_create ("wallet", com_tx_wallet, "Wallet info", "wallet [list | info -addr <addr> -w <wallet_name>]\n");
dap_chain_node_cli_cmd_item_create ("token_emit", com_token_emit, "Token emission",
- "token_emit addr <addr> tokent <token> certs <cert> emission_value <val>");
+ "token_emit addr <addr> tokent <token> certs <cert> emission_value <val>\n");
dap_chain_node_cli_cmd_item_create ("tx_create", com_tx_create, "Make transaction",
- "tx_create from_wallet_name <name> to_addr <addr> token <token> value <val> [fee <addr> value_fee <val>]" );
+ "tx_create from_wallet_name <name> to_addr <addr> token <token> value <val> [fee <addr> value_fee <val>]\n" );
dap_chain_node_cli_cmd_item_create ("tx_cond_create", com_tx_cond_create, "Make cond transaction",
- "tx_cond_create todo" );
+ "tx_cond_create todo\n" );
dap_chain_node_cli_cmd_item_create ("tx_verify", com_tx_verify, "Verifing transaction",
- "tx_verify -wallet <wallet name> [-path <wallet path>]" );
+ "tx_verify -wallet <wallet name> [-path <wallet path>]\n" );
// init client for handshake
diff --git a/dap_chain_node_cli_cmd.c b/dap_chain_node_cli_cmd.c
index 8f1925bdd91c0fa748863efbd2c97ba8b03e2753..163cf72edbcbf4f6ecfe6d45b8223421f6ccd721 100755
--- a/dap_chain_node_cli_cmd.c
+++ b/dap_chain_node_cli_cmd.c
@@ -1278,19 +1278,30 @@ int com_ping(int argc, const char** argv, char **str_reply)
int com_help(int argc, const char ** argv, char **str_reply)
{
if(argc > 1) {
+ log_it (L_DEBUG,"Help for command %s",argv[1]);
dap_chain_node_cmd_item_t *l_cmd = dap_chain_node_cli_cmd_find(argv[1]);
if(l_cmd) {
dap_chain_node_cli_set_reply_text(str_reply, "%s:\n%s", l_cmd->doc, l_cmd->doc_ex);
- return 1;
+ return 0;
+ }else {
+ dap_chain_node_cli_set_reply_text(str_reply, "command \"%s\" not recognized", argv[1]);
+ return -1;
}
- dap_chain_node_cli_set_reply_text(str_reply, "command \"%s\" not recognized", argv[1]);
- return -1;
- }
- else {
+ } else {
// TODO Read list of commands & return it
+ log_it (L_DEBUG,"General help requested");
+ dap_string_t * l_help_list_str = dap_string_new(NULL);
+ dap_chain_node_cmd_item_t *l_cmd = dap_chain_node_cli_cmd_get_first();
+ dap_string_printf(l_help_list_str,"");
+ while (l_cmd ){
+ dap_string_append_printf(l_help_list_str,"%s:\t\t\t%s\n",
+ l_cmd->name, l_cmd->doc? l_cmd->doc: "(undocumented command)");
+ l_cmd = (dap_chain_node_cmd_item_t*) l_cmd->hh.next;
+ }
+ dap_chain_node_cli_set_reply_text(str_reply,
+ "Available commands:\n\n%s\n", l_help_list_str->len? l_help_list_str->str : "NO ANY COMMAND WERE DEFINED");
+ return 0;
}
- if(str_reply)
- dap_chain_node_cli_set_reply_text(str_reply, "command not defined, enter \"help <cmd name>\"");
return -1;
}