From e1fabf03ec89f1cce6e717a47c7d4959f2aa0e67 Mon Sep 17 00:00:00 2001
From: "pavel.uhanov" <pavel.uhanov@demlabs.net>
Date: Tue, 27 Aug 2024 09:26:36 +0300
Subject: [PATCH] [*] adopt to hotted table
---
dap-sdk | 2 +-
modules/net/dap_chain_net.c | 1 +
modules/net/dap_chain_net_balancer.c | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index 847045237f..e9b9dec7fb 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 847045237fd637fa6f9e5b5ba80d2a9020c103a8
+Subproject commit e9b9dec7fb074e8e85ade7de2f51a5758773d67a
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index c955ad1786..f6464e1dcf 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2170,6 +2170,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx)
l_net->pub.ledger = dap_ledger_create(l_net, l_ledger_flags);
// Decrees initializing
dap_chain_net_decree_init(l_net);
+ dap_link_manager_erase_ignored_table(l_net->pub.id.uint64);
l_net->pub.config = l_cfg;
return 0;
diff --git a/modules/net/dap_chain_net_balancer.c b/modules/net/dap_chain_net_balancer.c
index 1c9f279734..f20b23830b 100644
--- a/modules/net/dap_chain_net_balancer.c
+++ b/modules/net/dap_chain_net_balancer.c
@@ -91,7 +91,7 @@ static dap_chain_net_links_t *s_get_ignored_node_addrs(dap_chain_net_t *a_net, s
const dap_stream_node_addr_t
*l_curr_addr = &dap_chain_net_get_my_node_info(a_net)->address,
*l_uplinks = dap_link_manager_get_net_links_addrs(a_net->pub.id.uint64, &l_uplinks_count, NULL, true),
- *l_low_availability = dap_link_manager_get_ignored_addrs(&l_low_availability_count);
+ *l_low_availability = dap_link_manager_get_ignored_addrs(&l_low_availability_count, a_net->pub.id.uint64);
if(!l_curr_addr->uint64 && !l_uplinks && !l_low_availability) {
log_it(L_WARNING, "Error forming ignore list in net %s, please check, should be minimum self addr", a_net->pub.name);
return NULL;
@@ -104,7 +104,7 @@ static dap_chain_net_links_t *s_get_ignored_node_addrs(dap_chain_net_t *a_net, s
for (size_t i = 0; i < l_uplinks_count; ++i) {
sprintf(l_ignored_str + strlen(l_ignored_str), "\t\t"NODE_ADDR_FP_STR"\n", NODE_ADDR_FP_ARGS(l_uplinks + i));
}
- sprintf(l_ignored_str + strlen(l_ignored_str), "\tLow availability:\n");
+ sprintf(l_ignored_str + strlen(l_ignored_str), "\tCooling:\n");
for (size_t i = 0; i < l_low_availability_count; ++i) {
sprintf(l_ignored_str + strlen(l_ignored_str), "\t\t"NODE_ADDR_FP_STR"\n", NODE_ADDR_FP_ARGS(l_low_availability + i));
}
--
GitLab