From e8bf1d2215957d3c74c720bc9928cdf23a693277 Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Tue, 5 Mar 2024 11:49:27 +0300
Subject: [PATCH] [*] Cluster links printing & adding
---
dap-sdk | 2 +-
modules/net/dap_chain_net.c | 2 +-
modules/net/dap_chain_node_cli_cmd.c | 16 ++++++++++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index 40ff133c16..efb41f0e05 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 40ff133c163d177dbfb2bbc1bf3ddfd0740ab1a4
+Subproject commit efb41f0e05542cd85065acf3e77bdf8cd80c022c
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 0ca54f3c6b..055251de29 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2147,7 +2147,7 @@ int s_net_init(const char * a_net_name, uint16_t a_acl_idx)
for (uint16_t i = 0; i < l_net_pvt->poa_nodes_count; ++i) {
uint16_t l_port = 0;
- char l_host[0xFF + 1] = { '\0' };
+ char l_host[DAP_HOSTADDR_STRLEN] = { '\0' };
dap_chain_node_addr_t l_addr;
if ( dap_stream_node_addr_from_str(&l_addr, l_poa_nodes_addrs[i])
|| dap_net_parse_hostname(l_seed_nodes_hosts[i], l_host, &l_port)) {
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 206764e7db..5956b8b192 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -1284,8 +1284,20 @@ int com_node(int a_argc, char ** a_argv, void **a_str_reply)
break;
}
*a_str_reply = dap_cluster_get_links_info(l_links_cluster);
- } else
- *a_str_reply = dap_cluster_get_links_info(NULL);
+ } else {
+ const char *l_guuid_str;
+ dap_cluster_t *l_cluster = NULL;
+ dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-cluster", &l_guuid_str);
+ if (l_guuid_str) {
+ dap_guuid_t l_guuid = { .raw = dap_uint128_from_hex_str(l_guuid_str) };
+ l_cluster = dap_cluster_find(l_guuid);
+ if (!l_cluster) {
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Not found cluster with ID %s", l_guuid_str);
+ break;
+ }
+ }
+ *a_str_reply = dap_cluster_get_links_info(l_cluster);
+ }
} break;
case CMD_BAN: {
--
GitLab