From f0ad7c5f6fba5369b976cf8e13b77bea09f037f3 Mon Sep 17 00:00:00 2001 From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net> Date: Wed, 28 Oct 2020 19:18:58 +0700 Subject: [PATCH] [+] Added 'version' command [!] Now full version is present in log files --- CMakeLists.txt | 2 +- modules/net/dap_chain_node_cli.c | 5 +++++ modules/net/dap_chain_node_cli_cmd.c | 19 +++++++++++++++++++ modules/net/include/dap_chain_node_cli_cmd.h | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29adb006ff..ed61ecd471 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(cellframe-sdk C) cmake_minimum_required(VERSION 2.8) set(CMAKE_C_STANDARD 11) -set(CELLFRAME_SDK_NATIVE_VERSION "2.6-27") +set(CELLFRAME_SDK_NATIVE_VERSION "2.6-28") add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"") set(DAPSDK_MODULES "") diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c index 4628c7a4d1..ff8712aab3 100644 --- a/modules/net/dap_chain_node_cli.c +++ b/modules/net/dap_chain_node_cli.c @@ -848,6 +848,11 @@ int dap_chain_node_cli_init(dap_config_t * g_config) "traceroute host\n"); dap_chain_node_cli_cmd_item_create ("tracepath", com_tracepath, NULL, "Traces path to a network host along this path", "tracepath host\n"); + dap_chain_node_cli_cmd_item_create ("version", com_version, NULL, "Return software version", + "version\n" + "\tReturn version number\n" + ); + dap_chain_node_cli_cmd_item_create ("help", com_help, NULL, "Description of command parameters", "help [<command>]\n" "\tObtain help for <command> or get the total list of the commands\n" diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c index 808303bc42..c8578df1f5 100644 --- a/modules/net/dap_chain_node_cli_cmd.c +++ b/modules/net/dap_chain_node_cli_cmd.c @@ -1475,6 +1475,25 @@ int com_ping(int argc, char** argv, void *arg_func, char **str_reply) return 0; } +/** + * @brief com_version + * @param argc + * @param argv + * @param arg_func + * @param str_reply + * @return + */ +int com_version(int argc, char ** argv, void *arg_func, char **str_reply) +{ + (void) argc; + (void) argv; + (void) arg_func; + dap_chain_node_cli_set_reply_text(str_reply, + "%s version %s\n", dap_get_appname(), DAP_VERSION ); + return 0; +} + + /** * Help command */ diff --git a/modules/net/include/dap_chain_node_cli_cmd.h b/modules/net/include/dap_chain_node_cli_cmd.h index a5be2cd0f8..1a45c52d97 100644 --- a/modules/net/include/dap_chain_node_cli_cmd.h +++ b/modules/net/include/dap_chain_node_cli_cmd.h @@ -77,6 +77,7 @@ int com_ping(int argc, char** argv, void *arg_func, char **str_reply); */ int com_help(int argc, char ** argv, void *arg_func, char **str_reply); +int com_version(int argc, char ** argv, void *arg_func, char **str_reply); /** * Token declaration -- GitLab