From 046596f1fa3c0ecb8b17bc56bb593e48200db666 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Fri, 26 Nov 2021 19:30:36 +0300
Subject: [PATCH] [+] Lost channels C&N
---
modules/net/dap_chain_net.c | 3 +++
modules/net/dap_chain_node_client.c | 1 +
modules/net/srv/dap_chain_net_srv.c | 7 ++++---
modules/net/srv/include/dap_chain_net_srv.h | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index ef56ed93cc..467ce31008 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -1065,6 +1065,9 @@ void dap_chain_net_delete( dap_chain_net_t * a_net )
*/
int dap_chain_net_init()
{
+ dap_stream_ch_chain_init();
+ dap_stream_ch_chain_net_init();
+
dap_chain_node_client_init();
dap_chain_node_cli_cmd_item_create ("net", s_cli_net, "Network commands",
"net list [chains -n <chain net name>]"
diff --git a/modules/net/dap_chain_node_client.c b/modules/net/dap_chain_node_client.c
index 46a0b193dd..111f7fd5ab 100644
--- a/modules/net/dap_chain_node_client.c
+++ b/modules/net/dap_chain_node_client.c
@@ -271,6 +271,7 @@ static void s_stage_connected_callback(dap_client_t *a_client, void *a_arg)
for(size_t i = 0; i < l_channels_count; i++) {
if(dap_chain_node_client_set_callbacks(a_client, l_client_internal->active_channels[i]) == -1) {
log_it(L_WARNING, "No ch_chain channel, can't init notify callback for pkt type CH_CHAIN");
+ return;
}
}
}
diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c
index 3b0ed4b365..5206e305e1 100644
--- a/modules/net/srv/dap_chain_net_srv.c
+++ b/modules/net/srv/dap_chain_net_srv.c
@@ -60,6 +60,7 @@
#include "dap_chain_net_srv.h"
#include "dap_chain_net_srv_order.h"
#include "dap_chain_net_srv_stream_session.h"
+#include "dap_stream_ch_chain_net_srv.h"
#ifdef DAP_MODULES_DYNAMIC
#include "dap_modules_dynamic_cdb.h"
#endif
@@ -90,9 +91,9 @@ static void s_load_all(void);
* @brief dap_chain_net_srv_init
* @return
*/
-int dap_chain_net_srv_init(dap_config_t * a_cfg)
-{
- UNUSED(a_cfg);
+int dap_chain_net_srv_init()
+{
+ dap_stream_ch_chain_net_srv_init();
m_uid = NULL;
m_uid_count = 0;
if( dap_chain_net_srv_order_init() != 0 )
diff --git a/modules/net/srv/include/dap_chain_net_srv.h b/modules/net/srv/include/dap_chain_net_srv.h
index cb018bdcfb..2fc2a3bea2 100755
--- a/modules/net/srv/include/dap_chain_net_srv.h
+++ b/modules/net/srv/include/dap_chain_net_srv.h
@@ -84,7 +84,7 @@ typedef struct dap_chain_net_srv
typedef void (*dap_chain_net_srv_callback_new_t)(dap_chain_net_srv_t *, dap_config_t *);
-int dap_chain_net_srv_init(dap_config_t * a_cfg);
+int dap_chain_net_srv_init();
void dap_chain_net_srv_deinit(void);
dap_chain_net_srv_t* dap_chain_net_srv_add(dap_chain_net_srv_uid_t a_uid,dap_chain_net_srv_callback_data_t a_callback_requested,
dap_chain_net_srv_callback_data_t a_callback_response_success,
--
GitLab