diff --git a/dap-sdk b/dap-sdk
index d8c20e868d8b11d40705f5efa8f84edd023ef473..52084ccdc2e6d219625937edc77ee56ff1c58f86 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit d8c20e868d8b11d40705f5efa8f84edd023ef473
+Subproject commit 52084ccdc2e6d219625937edc77ee56ff1c58f86
diff --git a/modules/channel/chain-net/dap_stream_ch_chain_net.c b/modules/channel/chain-net/dap_stream_ch_chain_net.c
index 8508fc08b23ce46dc3af6aa5c1b8f6fbcd43958a..85ba2f81e1866c5072f607ad2e5b7a7a95dd2725 100644
--- a/modules/channel/chain-net/dap_stream_ch_chain_net.c
+++ b/modules/channel/chain-net/dap_stream_ch_chain_net.c
@@ -112,6 +112,21 @@ static void session_data_del_all()
pthread_mutex_unlock(&s_hash_mutex);
}
+
+
+dap_chain_node_addr_t dap_stream_ch_chain_net_from_session_data_extract_node_addr(unsigned int a_session_id) {
+ dap_chain_node_addr_t l_addr= {0};
+ dap_chain_net_session_data_t *l_sdata, *l_sdata_tmp;
+ pthread_mutex_lock(&s_hash_mutex);
+ HASH_ITER(hh, s_chain_net_data , l_sdata, l_sdata_tmp) {
+ if (l_sdata->session_id == a_session_id) {
+ l_addr = l_sdata->addr_remote;
+ }
+ }
+ pthread_mutex_unlock(&s_hash_mutex);
+ return l_addr;
+}
+
uint8_t dap_stream_ch_chain_net_get_id()
{
return 'N';
diff --git a/modules/channel/chain-net/include/dap_stream_ch_chain_net.h b/modules/channel/chain-net/include/dap_stream_ch_chain_net.h
index 639f65044cc4a89061fe0369e37a055b9a2f66a9..a45464b2c8809025a0055cd80df68324dcb10a0f 100644
--- a/modules/channel/chain-net/include/dap_stream_ch_chain_net.h
+++ b/modules/channel/chain-net/include/dap_stream_ch_chain_net.h
@@ -65,6 +65,8 @@ typedef struct dap_stream_ch_chain_validator_test{
#define DAP_STREAM_CH_CHAIN_NET(a) ((dap_stream_ch_chain_net_t *) ((a)->internal) )
+dap_chain_node_addr_t dap_stream_ch_chain_net_from_session_data_extract_node_addr(unsigned int a_session_id);
+
uint8_t dap_stream_ch_chain_net_get_id();
int dap_stream_ch_chain_net_init();
void dap_stream_ch_chain_net_deinit();
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 5d88eb0608cd50de3582821ec7cfe59c75ead1dc..a38703a27067b7a106b36c68b1e8b3955adc8cc3 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -110,6 +110,7 @@
#include "dap_stream_ch_chain.h"
#include "dap_stream_ch_chain_pkt.h"
#include "dap_stream_ch.h"
+#include "dap_stream.h"
#include "dap_stream_ch_pkt.h"
#include "dap_chain_node_dns_client.h"
#include "dap_module.h"
@@ -211,6 +212,8 @@ typedef struct dap_chain_net_pvt{
pthread_rwlock_t states_lock;
dap_list_t *gdb_notifiers;
+
+ dap_interval_timer_t update_links_timer;
} dap_chain_net_pvt_t;
typedef struct dap_chain_net_item{
@@ -273,6 +276,24 @@ static uint8_t *s_net_set_acl(dap_chain_hash_fast_t *a_pkey_hash);
static void s_prepare_links_from_balancer(dap_chain_net_t *a_net);
static bool s_new_balancer_link_request(dap_chain_net_t *a_net, int a_link_replace_tries);
+//Timer update links
+
+static void s_update_links_timer_callback(void *a_arg){
+ dap_chain_net_t *l_net = (dap_chain_net_t*)a_arg;
+ //Updated links
+ size_t l_count_downlinks = 0;
+ dap_stream_connection_t ** l_downlinks = dap_stream_connections_get_downlinks(&l_count_downlinks);
+ DAP_DELETE(l_downlinks);
+ dap_chain_node_addr_t *l_current_addr = dap_chain_net_get_cur_addr(l_net);
+ dap_chain_node_info_t *l_node_info = dap_chain_node_info_read(l_net, l_current_addr);
+ if (!l_node_info)
+ return;
+ l_node_info->hdr.links_number = l_count_downlinks;
+ char *l_key = dap_chain_node_addr_to_hash_str(l_current_addr);
+ dap_global_db_set_sync(l_net->pub.gdb_nodes, l_key, l_node_info, dap_chain_node_info_get_size(l_node_info), false);
+ DAP_DELETE(l_node_info);
+}
+
static bool s_seed_mode = false;
/**
@@ -2750,6 +2771,7 @@ int s_net_load(dap_chain_net_t *a_net)
uint32_t l_timeout = dap_config_get_item_uint32_default(g_config, "node_client", "timer_update_states", 600);
PVT(l_net)->main_timer = dap_interval_timer_create(l_timeout * 1000, s_main_timer_callback, l_net);
log_it(L_INFO, "Chain network \"%s\" initialized",l_net->pub.name);
+ PVT(l_net)->update_links_timer = dap_interval_timer_create(600000, s_update_links_timer_callback, l_net);
dap_config_close(l_cfg);
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 725bbcb994f649a23cdc924c9bf1824f75e3573a..ef2ba6ef5e3ba4b7993b71f2b30d229a5668ee6b 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -1031,7 +1031,7 @@ int com_global_db(int a_argc, char ** a_argv, char **a_str_reply)
int com_node(int a_argc, char ** a_argv, char **a_str_reply)
{
enum {
- CMD_NONE, CMD_ADD, CMD_DEL, CMD_LINK, CMD_ALIAS, CMD_HANDSHAKE, CMD_CONNECT, CMD_DUMP
+ CMD_NONE, CMD_ADD, CMD_DEL, CMD_LINK, CMD_ALIAS, CMD_HANDSHAKE, CMD_CONNECT, CMD_DUMP, CMD_CONNECTIONS
};
int arg_index = 1;
int cmd_num = CMD_NONE;
@@ -1058,6 +1058,14 @@ int com_node(int a_argc, char ** a_argv, char **a_str_reply)
else if(dap_cli_server_cmd_find_option_val(a_argv, arg_index, min(a_argc, arg_index + 1), "dump", NULL)) {
cmd_num = CMD_DUMP;
}
+ else if (dap_cli_server_cmd_find_option_val(a_argv, arg_index, min(a_argc, arg_index + 1), "connections", NULL)) {
+ cmd_num = CMD_CONNECTIONS;
+// char *l_str = NULL;
+// dap_stream_connections_print(&l_str);
+// dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str);
+// DAP_DELETE(l_str);
+// return 0;
+ }
arg_index++;
if(cmd_num == CMD_NONE) {
dap_cli_server_cmd_set_reply_text(a_str_reply, "command %s not recognized", a_argv[1]);
@@ -1467,6 +1475,35 @@ int com_node(int a_argc, char ** a_argv, char **a_str_reply)
}
DAP_DELETE(node_info);
dap_cli_server_cmd_set_reply_text(a_str_reply, "Connection established");
+ }
+ case CMD_CONNECTIONS: {
+ size_t l_uplink_count = 0;
+ size_t l_downlink_count = 0;
+ dap_stream_connection_t **l_uplinks = dap_stream_connections_get_uplinks(&l_uplink_count);
+ dap_stream_connection_t **l_downlinks = dap_stream_connections_get_downlinks(&l_downlink_count);
+ dap_string_t *l_str_uplinks = dap_string_new("---------------------------\n"
+ "| ↑\\↓ |\t#\t|\t\tIP\t\t|\tPort\t|\n");
+ for (size_t i=0; i < l_uplink_count; i++) {
+ char *l_address = l_uplinks[i]->address;
+ short l_port = l_uplinks[i]->port;
+
+ dap_string_append_printf(l_str_uplinks, "| ↑ |\t%zu\t|\t%s\t\t|\t%u\t|\n",
+ i, l_address, l_port);
+ }
+ dap_string_t *l_str_downlinks = dap_string_new("---------------------------\n"
+ "| ↑\\↓ |\t#\t|\t\tIP\t\t|\n");
+ for (size_t i=0; i < l_downlink_count; i++) {
+ char *l_address = l_downlinks[i]->address;
+
+ dap_string_append_printf(l_str_downlinks, "| ↓ |\t%zu\t|\t%s\t\t|\n",
+ i, l_address);
+ }
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Count links: %zu\n\nUplinks: %zu\n%s\n\nDownlinks: %zu\n%s\n",
+ l_uplink_count + l_downlink_count, l_uplink_count, l_str_uplinks->str,
+ l_downlink_count, l_str_downlinks->str);
+ dap_string_free(l_str_uplinks, false);
+ dap_string_free(l_str_downlinks, false);
+ return 0;
}
break;
}
diff --git a/modules/net/include/dap_chain_node_client.h b/modules/net/include/dap_chain_node_client.h
index 7c3bf9d657e13f350f0d2fe137e2e413381b30ea..1d3230409727f6fc79d7ab3e8859c89247e675a9 100644
--- a/modules/net/include/dap_chain_node_client.h
+++ b/modules/net/include/dap_chain_node_client.h
@@ -148,6 +148,10 @@ dap_chain_node_client_t *dap_chain_node_client_create(dap_chain_net_t *a_net, da
bool dap_chain_node_client_connect(dap_chain_node_client_t *a_node_client, const char *a_active_channels);
+void dap_chain_node_client_added_gdb(dap_chain_node_client_t *a_node_client);
+
+void dap_chain_node_client_link_remove_gdb(dap_chain_node_client_t *a_node_client);
+
/**
* Create handshake to server
*