From 8dfc953d22c0a32b4282cd2a21641ed49f66124d Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Fri, 29 Mar 2024 19:30:47 +0300
Subject: [PATCH] [*] Net online|offline debug
---
dap-sdk | 2 +-
modules/net/dap_chain_net.c | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index f8a6d5cd7f..cbf935a2cf 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit f8a6d5cd7f5d4610b7f78fd8cd5caea075e0ab16
+Subproject commit cbf935a2cf70f2a6cf72e2c23c8d116126cb2aad
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 2ac0fbd7a7..58c8e8a517 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -388,13 +388,14 @@ int dap_chain_net_state_go_to(dap_chain_net_t *a_net, dap_chain_net_state_t a_ne
PVT(a_net)->state_target = a_new_state;
if (a_new_state == NET_STATE_OFFLINE) {
char l_err_str[] = "ERROR_NET_IS_OFFLINE";
- dap_stream_ch_chain_net_pkt_t *l_error = DAP_NEW_STACK_SIZE(dap_stream_ch_chain_net_pkt_t,
- sizeof(dap_stream_ch_chain_net_pkt_t) + sizeof(l_err_str));
+ size_t l_error_size = sizeof(dap_stream_ch_chain_net_pkt_t) + sizeof(l_err_str);
+ dap_stream_ch_chain_net_pkt_t *l_error = DAP_NEW_STACK_SIZE(dap_stream_ch_chain_net_pkt_t, l_error_size);
l_error->hdr.version = DAP_STREAM_CH_CHAIN_NET_PKT_VERSION;
l_error->hdr.net_id = a_net->pub.id;
+ l_error->hdr.data_size = sizeof(l_err_str);
memcpy(l_error->data, l_err_str, sizeof(l_err_str));
dap_cluster_broadcast(PVT(a_net)->nodes_cluster->links_cluster, DAP_STREAM_CH_CHAIN_NET_ID,
- DAP_STREAM_CH_CHAIN_NET_PKT_TYPE_ERROR, l_error, sizeof(l_error), NULL, 0);
+ DAP_STREAM_CH_CHAIN_NET_PKT_TYPE_ERROR, l_error, l_error_size, NULL, 0);
dap_link_manager_set_net_condition(a_net->pub.id.uint64, false);
dap_chain_esbocs_stop_timer(a_net->pub.id);
} else if (PVT(a_net)->state == NET_STATE_OFFLINE) {
@@ -642,12 +643,12 @@ int s_link_manager_link_request(uint64_t a_net_id)
if (l_net_pvt->state == NET_STATE_LINKS_PREPARE)
l_net_pvt->state = NET_STATE_LINKS_CONNECTING;
size_t l_required_links_count = dap_link_manager_needed_links_count(l_net->pub.id.uint64);
- /* TODO make correct asynchronous local balancer request
+ // TODO make correct asynchronous local balancer request
dap_chain_net_links_t *l_links = dap_chain_net_balancer_get_node(l_net->pub.name, l_required_links_count);
if (l_links) {
s_balancer_link_prepare_success(l_net, l_links);
return 0;
- }*/
+ }
// dynamic links from http balancer request
struct balancer_link_request *l_balancer_request = NULL;
DAP_NEW_Z_RET_VAL(l_balancer_request, struct balancer_link_request, -4, NULL);
--
GitLab