diff --git a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
index 6ff08a3d9af94f9a5ba261c170fb7d7c409a6d92..581bd252e72912ae6473c9b1dafc90279b20e05f 100644
--- a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
+++ b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
@@ -49,11 +49,6 @@ typedef struct usages_in_grace{
UT_hash_handle hh;
} usages_in_grace_t;
-uint8_t dap_stream_ch_chain_net_srv_get_id()
-{
- return 'R';
-}
-
static void s_stream_ch_new(dap_stream_ch_t* ch , void* arg);
static void s_stream_ch_delete(dap_stream_ch_t* ch , void* arg);
static void s_stream_ch_packet_in(dap_stream_ch_t* ch , void* arg);
@@ -136,7 +131,7 @@ static pthread_mutex_t s_ht_grace_table_mutex;
int dap_stream_ch_chain_net_srv_init(void)
{
log_it(L_NOTICE,"Chain network services channel initialized");
- dap_stream_ch_proc_add(dap_stream_ch_chain_net_srv_get_id(),s_stream_ch_new,s_stream_ch_delete,s_stream_ch_packet_in,s_stream_ch_packet_out);
+ dap_stream_ch_proc_add(DAP_STREAM_CH_ID_NET_SRV, s_stream_ch_new,s_stream_ch_delete,s_stream_ch_packet_in,s_stream_ch_packet_out);
pthread_mutex_init(&s_ht_grace_table_mutex, NULL);
return 0;
@@ -352,8 +347,7 @@ static void s_service_start(dap_stream_ch_t* a_ch , dap_stream_ch_chain_net_srv_
static void s_grace_period_start(dap_chain_net_srv_grace_t *a_grace)
{
assert(a_grace);
- dap_stream_ch_chain_net_srv_pkt_error_t l_err;
- memset(&l_err, 0, sizeof(l_err));
+ dap_stream_ch_chain_net_srv_pkt_error_t l_err = { };
dap_stream_ch_t *l_ch = dap_stream_ch_find_by_uuid_unsafe(a_grace->stream_worker, a_grace->ch_uuid);
if (!l_ch){
diff --git a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.h b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.h
index 649a749c21f00447d3b8d18b9f27801043aa0b1c..3346512aa75e30fe3096705b04f3649f74851fde 100644
--- a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.h
+++ b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.h
@@ -53,8 +53,8 @@ typedef struct dap_stream_ch_chain_net_srv {
} dap_stream_ch_chain_net_srv_t;
#define DAP_STREAM_CH_CHAIN_NET_SRV(a) ((dap_stream_ch_chain_net_srv_t *) ((a)->internal) )
+#define DAP_STREAM_CH_ID_NET_SRV 'R'
-uint8_t dap_stream_ch_chain_net_srv_get_id();
int dap_stream_ch_chain_net_srv_init(void);
void dap_stream_ch_chain_net_srv_tx_cond_added_cb(void *a_arg, dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx);
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 56b46630f9f0b3e306bc36b31d71443471352bb7..9d61eb5a56d5065debcfcc099bddbb2b6938d520 100644
--- a/modules/channel/chain-net/dap_stream_ch_chain_net.c
+++ b/modules/channel/chain-net/dap_stream_ch_chain_net.c
@@ -127,11 +127,6 @@ dap_chain_node_addr_t dap_stream_ch_chain_net_from_session_data_extract_node_add
return l_addr;
}
-uint8_t dap_stream_ch_chain_net_get_id()
-{
- return 'N';
-}
-
/**
* @brief dap_stream_ch_chain_net_init
* @return always 0
@@ -139,7 +134,7 @@ uint8_t dap_stream_ch_chain_net_get_id()
int dap_stream_ch_chain_net_init()
{
log_it(L_NOTICE, "Chain network channel initialized");
- dap_stream_ch_proc_add(dap_stream_ch_chain_net_get_id(), s_stream_ch_new, s_stream_ch_delete,
+ dap_stream_ch_proc_add(DAP_STREAM_CH_ID_NET, s_stream_ch_new, s_stream_ch_delete,
s_stream_ch_packet_in, s_stream_ch_packet_out);
return 0;
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 a45464b2c8809025a0055cd80df68324dcb10a0f..78dc6d609a869a9c46e501bb073448113469baf6 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
@@ -62,11 +62,10 @@ typedef struct dap_stream_ch_chain_validator_test{
#define D_SIGN 0x40//data signed
#define F_CERT 0x80//faund sert
-
+#define DAP_STREAM_CH_ID_NET 'N'
#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/channel/chain-voting/dap_stream_ch_chain_voting.c b/modules/channel/chain-voting/dap_stream_ch_chain_voting.c
index 64cc05f10a90c326abdbe20d413d0e3ee170972d..f849d71c2e446562cc2fad292a493904795e3b28 100644
--- a/modules/channel/chain-voting/dap_stream_ch_chain_voting.c
+++ b/modules/channel/chain-voting/dap_stream_ch_chain_voting.c
@@ -41,7 +41,7 @@ int dap_stream_ch_chain_voting_init()
{
log_it(L_NOTICE, "Chains voting channel initialized");
- dap_stream_ch_proc_add(dap_stream_ch_chain_voting_get_id(),
+ dap_stream_ch_proc_add(DAP_STREAM_CH_ID_VOTING,
s_stream_ch_new,
s_stream_ch_delete,
s_stream_ch_packet_in,
@@ -95,7 +95,7 @@ void dap_stream_ch_chain_voting_message_write(dap_chain_net_t *a_net, dap_chain_
log_it(L_WARNING, "Can't find validator's addr "NODE_ADDR_FP_STR" in database", NODE_ADDR_FP_ARGS(a_remote_node_addr));
return;
}
- char l_channels[] = {dap_stream_ch_chain_voting_get_id(),0};
+ char l_channels[] = { DAP_STREAM_CH_ID_VOTING, '\0' };
dap_chain_node_client_t *l_node_client = dap_chain_node_client_connect_channels(a_net, l_node_info, l_channels);
if (!l_node_client || !l_node_client->client) {
log_it(L_ERROR, "Can't connect to remote node "NODE_ADDR_FP_STR, NODE_ADDR_FP_ARGS(a_remote_node_addr));
@@ -118,7 +118,7 @@ void dap_stream_ch_chain_voting_message_write(dap_chain_net_t *a_net, dap_chain_
log_it(L_ERROR, "NULL node_client in item of voting channel");
return;
}
- dap_chain_node_client_write_mt(l_node_client_item->node_client, dap_stream_ch_chain_voting_get_id(),
+ dap_chain_node_client_write_mt(l_node_client_item->node_client, DAP_STREAM_CH_ID_VOTING,
DAP_STREAM_CH_CHAIN_VOTING_PKT_TYPE_DATA, a_voting_pkt,
l_voting_pkt_size);
} else
diff --git a/modules/channel/chain-voting/include/dap_stream_ch_chain_voting.h b/modules/channel/chain-voting/include/dap_stream_ch_chain_voting.h
index b26344f362e1c1609e567e8f436299ee32983ae5..a65b633ff6087b22e1700076d17eb77e7248679f 100644
--- a/modules/channel/chain-voting/include/dap_stream_ch_chain_voting.h
+++ b/modules/channel/chain-voting/include/dap_stream_ch_chain_voting.h
@@ -13,6 +13,8 @@
#define DAP_STREAM_CH_CHAIN_VOTING_PKT_TYPE_DATA 0x01
#define DAP_STREAM_CH_CHAIN_VOTING_PKT_TYPE_TEST 0x02
+#define DAP_STREAM_CH_ID_VOTING 'V'
+
typedef void (*dap_chain_voting_ch_callback_t)(void *a_arg, dap_chain_node_addr_t *a_sender_addr, dap_chain_node_addr_t *a_receiver_addr,
dap_chain_hash_fast_t *a_data_hash, uint8_t *a_data, size_t a_data_size);
diff --git a/modules/channel/chain/dap_stream_ch_chain.c b/modules/channel/chain/dap_stream_ch_chain.c
index 47f8fc81c08ebc55bf1c3e736bf593936384ea8b..c6701c3a56a1cd69272146466d3278e174ebc9be 100644
--- a/modules/channel/chain/dap_stream_ch_chain.c
+++ b/modules/channel/chain/dap_stream_ch_chain.c
@@ -152,7 +152,7 @@ static dap_memstat_rec_t s_memstat [MEMSTAT$K_NR] = {
int dap_stream_ch_chain_init()
{
log_it(L_NOTICE, "Chains and global db exchange channel initialized");
- dap_stream_ch_proc_add(dap_stream_ch_chain_get_id(), s_stream_ch_new, s_stream_ch_delete, s_stream_ch_packet_in,
+ dap_stream_ch_proc_add(DAP_STREAM_CH_ID, s_stream_ch_new, s_stream_ch_delete, s_stream_ch_packet_in,
s_stream_ch_packet_out);
s_debug_more = dap_config_get_item_bool_default(g_config,"stream_ch_chain","debug_more",false);
s_update_pack_size = dap_config_get_item_int16_default(g_config,"stream_ch_chain","update_pack_size",100);
@@ -1570,7 +1570,7 @@ static void s_stream_ch_io_complete(dap_events_socket_t *a_es, void *a_arg, int
return;
dap_stream_ch_t *l_ch = NULL;
for (size_t i = 0; i < l_stream->channel_count; i++)
- if (l_stream->channel[i]->proc->id == dap_stream_ch_chain_get_id())
+ if (l_stream->channel[i]->proc->id == DAP_STREAM_CH_ID)
l_ch = l_stream->channel[i];
if (!l_ch)
return;
diff --git a/modules/channel/chain/include/dap_stream_ch_chain.h b/modules/channel/chain/include/dap_stream_ch_chain.h
index b0542a834c6a4d7433f062182134795bd45dd8d5..6a3d9fa188ddf2509b0213b1bd729e3367de9d39 100644
--- a/modules/channel/chain/include/dap_stream_ch_chain.h
+++ b/modules/channel/chain/include/dap_stream_ch_chain.h
@@ -89,11 +89,11 @@ typedef struct dap_stream_ch_chain {
#define DAP_STREAM_CH_CHAIN(a) ((dap_stream_ch_chain_t *) ((a)->internal) )
#define DAP_STREAM_CH(a) ((dap_stream_ch_t *)((a)->_inheritor))
#define DAP_CHAIN_PKT_EXPECT_SIZE 7168
+#define DAP_STREAM_CH_ID 'C'
int dap_stream_ch_chain_init(void);
void dap_stream_ch_chain_deinit(void);
-inline static uint8_t dap_stream_ch_chain_get_id(void) { return (uint8_t) 'C'; }
void dap_stream_ch_chain_create_sync_request_gdb(dap_stream_ch_chain_t * a_ch_chain, dap_chain_net_t * a_net);
void dap_stream_ch_chain_timer_start(dap_stream_ch_chain_t *a_ch_chain);
void dap_stream_ch_chain_reset_unsafe(dap_stream_ch_chain_t *a_ch_chain);
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 9c980ef5a0206b882af0974303dd10f8d9ed4785..1bc5b82d57372aab3049a931d6511dc4ef4040e2 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -1399,7 +1399,7 @@ int com_node(int a_argc, char ** a_argv, char **a_str_reply)
log_it(L_NOTICE, "Stream connection established");
dap_stream_ch_chain_sync_request_t l_sync_request = {};
- dap_stream_ch_t * l_ch_chain = dap_client_get_stream_ch_unsafe(l_node_client->client, dap_stream_ch_chain_get_id());
+ dap_stream_ch_t * l_ch_chain = dap_client_get_stream_ch_unsafe(l_node_client->client, DAP_STREAM_CH_ID);
// fill begin id
l_sync_request.id_start = 1;
// fill current node address
@@ -1409,7 +1409,7 @@ int com_node(int a_argc, char ** a_argv, char **a_str_reply)
if(!l_sync_request.node_addr.uint64 )
{
log_it(L_NOTICE, "Now get node addr");
- uint8_t l_ch_id = dap_stream_ch_chain_net_get_id();
+ uint8_t l_ch_id = DAP_STREAM_CH_ID_NET;
dap_stream_ch_t * l_ch_chain = dap_client_get_stream_ch_unsafe(l_node_client->client, l_ch_id);
size_t res = dap_stream_ch_chain_net_pkt_write(l_ch_chain,
diff --git a/modules/net/dap_chain_node_client.c b/modules/net/dap_chain_node_client.c
index c80bc435c37a8fd5c67fe07f00a0aec60cce6466..718752e56d51a424f7a25b5ffb8cb9386b66a536 100644
--- a/modules/net/dap_chain_node_client.c
+++ b/modules/net/dap_chain_node_client.c
@@ -739,7 +739,7 @@ bool dap_chain_node_client_connect(dap_chain_node_client_t *a_node_client, const
dap_client_set_auth_cert(a_node_client->client, a_node_client->net->pub.name);
- char l_host_addr[INET6_ADDRSTRLEN];
+ char l_host_addr[INET6_ADDRSTRLEN] = { '\0' };
if(a_node_client->info->hdr.ext_addr_v4.s_addr){
struct sockaddr_in sa4 = { .sin_family = AF_INET, .sin_addr = a_node_client->info->hdr.ext_addr_v4 };
inet_ntop(AF_INET, &(((struct sockaddr_in *) &sa4)->sin_addr), l_host_addr, INET6_ADDRSTRLEN);
@@ -951,47 +951,56 @@ static int s_node_client_set_notify_callbacks(dap_client_t *a_client, uint8_t a_
// find current channel code
dap_stream_ch_t *l_ch = dap_client_get_stream_ch_unsafe(a_client, a_ch_id);
if(l_ch) {
- // C
- if(a_ch_id == dap_stream_ch_chain_get_id()) {
- dap_stream_ch_chain_t *l_ch_chain = DAP_STREAM_CH_CHAIN(l_ch);
- l_ch_chain->callback_notify_packet_out = s_ch_chain_callback_notify_packet_out;
- l_ch_chain->callback_notify_packet_in = s_ch_chain_callback_notify_packet_in;
- l_ch_chain->callback_notify_arg = l_node_client;
- l_node_client->ch_chain = l_ch;
- l_node_client->ch_chain_uuid = l_ch->uuid;
+ l_ret = 0;
+ switch (a_ch_id) {
+ // 'C'
+ case DAP_STREAM_CH_ID: {
+ dap_stream_ch_chain_t *l_ch_chain = DAP_STREAM_CH_CHAIN(l_ch);
+ l_ch_chain->callback_notify_packet_out = s_ch_chain_callback_notify_packet_out;
+ l_ch_chain->callback_notify_packet_in = s_ch_chain_callback_notify_packet_in;
+ l_ch_chain->callback_notify_arg = l_node_client;
+ l_node_client->ch_chain = l_ch;
+ l_node_client->ch_chain_uuid = l_ch->uuid;
+ break;
}
- // N
- if(a_ch_id == dap_stream_ch_chain_net_get_id()) {
- dap_stream_ch_chain_net_t *l_ch_chain = DAP_STREAM_CH_CHAIN_NET(l_ch);
- l_ch_chain->notify_callback = s_ch_chain_callback_notify_packet_in2;
+ // 'N'
+ case DAP_STREAM_CH_ID_NET: {
+ dap_stream_ch_chain_net_t *l_ch_chain = DAP_STREAM_CH_CHAIN_NET(l_ch);
+ l_ch_chain->notify_callback = s_ch_chain_callback_notify_packet_in2;
l_ch_chain->notify_callback_arg = l_node_client;
- l_node_client->ch_chain_net = l_ch;
- l_node_client->ch_chain_net_uuid = l_ch->uuid;
+ l_node_client->ch_chain_net = l_ch;
+ l_node_client->ch_chain_net_uuid = l_ch->uuid;
+ break;
}
- // R
- if(a_ch_id == dap_stream_ch_chain_net_srv_get_id()) {
+ // 'R'
+ case DAP_STREAM_CH_ID_NET_SRV: {
dap_stream_ch_chain_net_srv_t *l_ch_chain = DAP_STREAM_CH_CHAIN_NET_SRV(l_ch);
if (l_node_client->notify_callbacks.srv_pkt_in) {
- l_ch_chain->notify_callback = (dap_stream_ch_chain_net_srv_callback_packet_t)
- l_node_client->notify_callbacks.srv_pkt_in;
+ l_ch_chain->notify_callback = (dap_stream_ch_chain_net_srv_callback_packet_t)l_node_client->notify_callbacks.srv_pkt_in;
l_ch_chain->notify_callback_arg = l_node_client->callbacks_arg;
} else {
- l_ch_chain->notify_callback = s_ch_chain_callback_notify_packet_R;
+ l_ch_chain->notify_callback = s_ch_chain_callback_notify_packet_R;
l_ch_chain->notify_callback_arg = l_node_client;
}
- l_node_client->ch_chain_net_srv = l_ch;
- l_node_client->ch_chain_net_srv_uuid = l_ch->uuid;
+ l_node_client->ch_chain_net_srv = l_ch;
+ l_node_client->ch_chain_net_srv_uuid = l_ch->uuid;
+ break;
+ }
+ // 'V'
+ case DAP_STREAM_CH_ID_VOTING: {
+ dap_stream_ch_chain_voting_t *l_ch_chain = DAP_STREAM_CH_CHAIN_VOTING(l_ch);
+ // l_ch_chain->callback_notify = s_ch_chain_callback_notify_voting_packet_in;
+ l_ch_chain->callback_notify_arg = l_node_client;
+ l_node_client->ch_chain_net = l_ch;
+ l_node_client->ch_chain_net_uuid = l_ch->uuid;
+ break;
+ }
+ default: {
+ l_ret = -2;
+ log_it(L_ERROR, "Unknown channel id %d", a_ch_id);
+ break;
}
- // V
- if ( a_ch_id == dap_stream_ch_chain_voting_get_id() ) {
- dap_stream_ch_chain_voting_t *l_ch_chain = DAP_STREAM_CH_CHAIN_VOTING(l_ch);
- // l_ch_chain->callback_notify = s_ch_chain_callback_notify_voting_packet_in;
- l_ch_chain->callback_notify_arg = l_node_client;
- l_node_client->ch_chain_net = l_ch;
- l_node_client->ch_chain_net_uuid = l_ch->uuid;
}
- l_ret = 0;
- } else {
}
pthread_mutex_unlock(&l_node_client->wait_mutex);
}
diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c
index ed48d6700f6df1d7028fb3da2ec9a559e1f7e054..d1ba291cf55cd4d4ec3f775e607bc96503301490 100644
--- a/modules/net/srv/dap_chain_net_srv.c
+++ b/modules/net/srv/dap_chain_net_srv.c
@@ -61,6 +61,8 @@
#define LOG_TAG "chain_net_srv"
+#define MAX_VPN_UNIT_PRICE 1000000000000000000
+
typedef struct service_list {
dap_chain_net_srv_uid_t uid;
dap_chain_net_srv_t * srv;
@@ -844,7 +846,7 @@ int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, cons
}
l_price->net = l_net;
l_price->net_name = dap_strdup(l_net->pub.name);
- uint256_t l_max_price = GET_256_FROM_64((uint64_t)1000000000000000); // Change this value when max price wil be calculated
+ uint256_t l_max_price = GET_256_FROM_64((uint64_t)MAX_VPN_UNIT_PRICE); // Change this value when max price wil be calculated
if (!compare256(l_order->price, uint256_0) || l_order->units == 0 ){
DAP_DELETE(l_price);
continue;
@@ -857,11 +859,12 @@ int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, cons
uint256_t l_price_unit = uint256_0;
DIV_256(l_price->value_datoshi, GET_256_FROM_64(l_order->units), &l_price_unit);
if (compare256(l_price_unit, l_max_price)>0){
+ char *a = dap_chain_balance_print(l_price_unit), *b = dap_chain_balance_print(l_max_price);
+ log_it(L_ERROR, "Unit price exeeds max permitted value: %s > %s", a, b);
DAP_DELETE(l_price);
continue;
}
}
-
l_price->wallet = l_wallet;
DL_APPEND(a_srv->pricelist, l_price);
break;
@@ -878,7 +881,6 @@ int dap_chain_net_srv_parse_pricelist(dap_chain_net_srv_t *a_srv, const char *a_
if (!a_config_section)
return ret;
a_srv->grace_period = dap_config_get_item_uint32_default(g_config, a_config_section, "grace_period", 60);
- //! IMPORTANT ! This fetch is single-action and cannot be further reused, since it modifies the stored config data
uint16_t l_pricelist_count = 0;
char **l_pricelist = dap_config_get_array_str(g_config, a_config_section, "pricelist", &l_pricelist_count);
for (uint16_t i = 0; i < l_pricelist_count; i++) {
@@ -888,8 +890,8 @@ int dap_chain_net_srv_parse_pricelist(dap_chain_net_srv_t *a_srv, const char *a_
return ret;
}
short l_iter = 0;
- char *l_ctx;
- for (char *l_price_token = strtok_r(l_pricelist[i], ":", &l_ctx); l_price_token || l_iter == 6; l_price_token = strtok_r(NULL, ":", &l_ctx), ++l_iter) {
+ char *l_price_str = dap_strdup(l_pricelist[i]), *l_ctx;
+ for (char *l_price_token = strtok_r(l_price_str, ":", &l_ctx); l_price_token || l_iter == 6; l_price_token = strtok_r(NULL, ":", &l_ctx), ++l_iter) {
//log_it(L_DEBUG, "Tokenizer: %s", l_price_token);
switch (l_iter) {
case 0:
@@ -954,10 +956,11 @@ int dap_chain_net_srv_parse_pricelist(dap_chain_net_srv_t *a_srv, const char *a_
log_it(L_DEBUG, "Done with price item %d", i);
if (l_iter == 6)
DL_APPEND(a_srv->pricelist, l_price);
- else
- DAP_DELETE(l_price);
break; // double break exits tokenizer loop and steps to next price item
}
+ if (l_iter != 6)
+ DAP_DELETE(l_price);
+ DAP_DELETE(l_price_str);
}
return ret;
}
diff --git a/modules/net/srv/dap_chain_net_srv_client.c b/modules/net/srv/dap_chain_net_srv_client.c
index 69ac80d4f1fb9f65b6bce6fa2f62f2d20fd8dfc6..9a8419638770fe3757f228ebc866aeac3a73a35d 100644
--- a/modules/net/srv/dap_chain_net_srv_client.c
+++ b/modules/net/srv/dap_chain_net_srv_client.c
@@ -61,7 +61,7 @@ dap_chain_net_srv_client_t *dap_chain_net_srv_client_create_n_connect(dap_chain_
}
inet_pton(AF_INET, a_addr, &l_info->hdr.ext_addr_v4);
l_info->hdr.ext_port = a_port;
- const char l_channels[] = {dap_stream_ch_chain_net_srv_get_id(), '\0'};
+ const char l_channels[] = {DAP_STREAM_CH_ID_NET_SRV, '\0'};
l_ret->node_client = dap_chain_node_client_create_n_connect(a_net, l_info,
l_channels,
&l_callbacks, l_ret);
@@ -75,8 +75,7 @@ ssize_t dap_chain_net_srv_client_write(dap_chain_net_srv_client_t *a_client, uin
if (!a_client || !a_client->net_client || dap_client_get_stage(a_client->net_client) != STAGE_STREAM_STREAMING)
return -1;
if (a_type == DAP_STREAM_CH_CHAIN_NET_SRV_PKT_TYPE_REQUEST) {
- dap_stream_ch_t *l_ch = dap_client_get_stream_ch_unsafe(a_client->net_client,
- dap_stream_ch_chain_net_srv_get_id());
+ dap_stream_ch_t *l_ch = dap_client_get_stream_ch_unsafe(a_client->net_client, DAP_STREAM_CH_ID_NET_SRV);
dap_stream_ch_chain_net_srv_t *a_ch_chain = DAP_STREAM_CH_CHAIN_NET_SRV(l_ch);
dap_stream_ch_chain_net_srv_pkt_request_t *l_request = (dap_stream_ch_chain_net_srv_pkt_request_t *)a_pkt_data;
a_ch_chain->srv_uid.uint64 = l_request->hdr.srv_uid.uint64;
diff --git a/modules/net/srv/include/dap_chain_net_srv.h b/modules/net/srv/include/dap_chain_net_srv.h
index faf5c86de72a17fbc1b61dbd23e28d6e3ddf6a97..bde2977e8998d58fccc1b0efaaf6a231ffe1ea0a 100755
--- a/modules/net/srv/include/dap_chain_net_srv.h
+++ b/modules/net/srv/include/dap_chain_net_srv.h
@@ -304,7 +304,6 @@ const dap_chain_net_srv_uid_t * dap_chain_net_srv_list(void);
dap_chain_datum_tx_receipt_t * dap_chain_net_srv_issue_receipt(dap_chain_net_srv_t *a_srv,
dap_chain_net_srv_price_t * a_price,
const void * a_ext, size_t a_ext_size);
-uint8_t dap_stream_ch_chain_net_srv_get_id();
int dap_chain_net_srv_parse_pricelist(dap_chain_net_srv_t *a_srv, const char *a_config_section);
int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, const char *a_config_section);
diff --git a/modules/net/srv/include/dap_chain_net_srv_order.h b/modules/net/srv/include/dap_chain_net_srv_order.h
index 7924373573c17055ad0df8e5617afe4fbda20a75..db9ab023e0494fd1a5a51de13e6ab74bb625bad9 100644
--- a/modules/net/srv/include/dap_chain_net_srv_order.h
+++ b/modules/net/srv/include/dap_chain_net_srv_order.h
@@ -167,11 +167,7 @@ void dap_chain_net_srv_order_add_notify_callback(dap_chain_net_t *a_net, dap_sto
*/
DAP_STATIC_INLINE char * dap_chain_net_srv_order_get_gdb_group(dap_chain_net_t * a_net)
{
- if ( a_net ) {
- const char c_srv_order_group_str[]="service.orders";
- return dap_strdup_printf("%s.%s",a_net->pub.gdb_groups_prefix,c_srv_order_group_str);
- }
- return NULL;
+ return a_net ? dap_strdup_printf("%s.service.orders",a_net->pub.gdb_groups_prefix) : NULL;
}
/**
@@ -181,9 +177,5 @@ DAP_STATIC_INLINE char * dap_chain_net_srv_order_get_gdb_group(dap_chain_net_t *
*/
DAP_STATIC_INLINE char * dap_chain_net_srv_order_get_nodelist_group(dap_chain_net_t * a_net)
{
- if ( a_net ) {
- const char c_srv_order_group_str[]="service.orders.static_nodelist";
- return dap_strdup_printf("%s.%s",a_net->pub.gdb_groups_prefix,c_srv_order_group_str);
- }
- return NULL;
+ return a_net ? dap_strdup_printf("%s.service.orders.static_nodelist",a_net->pub.gdb_groups_prefix) : NULL;
}
diff --git a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
index b7db19d679a46d3305db23be037303f4d5a3f938..15951678d8e6b6b184ec853d4d585e16115517b7 100644
--- a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
+++ b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
@@ -1359,7 +1359,7 @@ bool dap_chain_net_srv_stake_check_validator(dap_chain_net_t * a_net, dap_hash_f
}
log_it(L_NOTICE, "Stream connection established");
- uint8_t l_ch_id = dap_stream_ch_chain_net_get_id();
+ uint8_t l_ch_id = DAP_STREAM_CH_ID_NET;
dap_stream_ch_t * l_ch_chain = dap_client_get_stream_ch_unsafe(l_node_client->client, l_ch_id);
randombytes(l_test_data, sizeof(l_test_data));
diff --git a/modules/service/vpn/dap_chain_net_vpn_client.c b/modules/service/vpn/dap_chain_net_vpn_client.c
index 8700755ce1193d311681b4b731b72597a8607dfd..dcb14f61a6383d388eb8650074bac6e1cd5ae594 100644
--- a/modules/service/vpn/dap_chain_net_vpn_client.c
+++ b/modules/service/vpn/dap_chain_net_vpn_client.c
@@ -514,7 +514,7 @@ int dap_chain_net_vpn_client_check(dap_chain_net_t *a_net, const char *a_ipv4_st
clock_gettime(CLOCK_REALTIME, &l_t);//get_cur_time_msec
long l_t1 = l_t.tv_sec * 1000 + l_t.tv_nsec / 1e6;
- const char l_active_channels[] = { dap_stream_ch_chain_net_srv_get_id(), 0 }; //only R, without S
+ const char l_active_channels[] = { DAP_STREAM_CH_ID_NET_SRV, 0 }; //only R, without S
if(a_ipv4_str)
inet_pton(AF_INET, a_ipv4_str, &(s_node_info->hdr.ext_addr_v4));
if(a_ipv6_str)
@@ -544,7 +544,7 @@ int dap_chain_net_vpn_client_check(dap_chain_net_t *a_net, const char *a_ipv4_st
int l_dtime_connect_ms = l_t2 - l_t1;
{
- uint8_t l_ch_id = dap_stream_ch_chain_net_srv_get_id(); // Channel id for chain net request = 'R'
+ uint8_t l_ch_id = DAP_STREAM_CH_ID_NET_SRV; // Channel id for chain net request = 'R'
dap_stream_ch_t *l_ch = dap_client_get_stream_ch_unsafe(s_vpn_client->client, l_ch_id);
if(l_ch) {
typedef dap_stream_ch_chain_net_srv_pkt_test_t pkt_t;
@@ -602,7 +602,7 @@ int dap_chain_net_vpn_client_start(dap_chain_net_t *a_net, const char *a_ipv4_st
s_node_info = DAP_NEW_Z(dap_chain_node_info_t);
s_node_info->hdr.ext_port = a_port;
- const char l_active_channels[] = { dap_stream_ch_chain_net_srv_get_id(), DAP_STREAM_CH_ID_NET_SRV_VPN, 0 }; //R, S
+ const char l_active_channels[] = { DAP_STREAM_CH_ID_NET_SRV, DAP_STREAM_CH_ID_NET_SRV_VPN, 0 }; //R, S
if(a_ipv4_str)
inet_pton(AF_INET, a_ipv4_str, &(s_node_info->hdr.ext_addr_v4));
if(a_ipv6_str)
@@ -633,7 +633,7 @@ int dap_chain_net_vpn_client_start(dap_chain_net_t *a_net, const char *a_ipv4_st
// send first packet to server
{
- uint8_t l_ch_id = dap_stream_ch_chain_net_srv_get_id(); // Channel id for chain net request = 'R'
+ uint8_t l_ch_id = DAP_STREAM_CH_ID_NET_SRV; // Channel id for chain net request = 'R'
dap_stream_ch_t *l_ch = dap_client_get_stream_ch_unsafe(s_vpn_client->client, l_ch_id);
if(l_ch) {
dap_stream_ch_chain_net_srv_pkt_request_t l_request;
@@ -675,7 +675,7 @@ int dap_chain_net_vpn_client_stop(void)
dap_chain_net_vpn_client_status_t dap_chain_net_vpn_client_status(void)
{
if(s_vpn_client) {
- uint8_t l_ch_id = dap_stream_ch_chain_net_srv_get_id(); // Channel id for chain net request = 'R'
+ uint8_t l_ch_id = DAP_STREAM_CH_ID_NET_SRV; // Channel id for chain net request = 'R'
dap_stream_ch_t *l_ch = dap_client_get_stream_ch_unsafe(s_vpn_client->client, l_ch_id);
if(!l_ch)
return VPN_CLIENT_STATUS_CONN_LOST;