From f75453a11cdbbff37f80b864768aabc04c07b2b6 Mon Sep 17 00:00:00 2001
From: cellframe <roman.khlopkov@demlabs.net>
Date: Fri, 15 Apr 2022 08:03:25 +0300
Subject: [PATCH] [*] Warnings fixes
---
modules/common/dap_chain_datum.c | 4 ++--
modules/net/dap_chain_net.c | 6 +++---
modules/net/dap_chain_node_cli.c | 4 ++--
modules/service/vpn/dap_chain_net_vpn_client.c | 3 ++-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/modules/common/dap_chain_datum.c b/modules/common/dap_chain_datum.c
index b41554b638..ca90883f9b 100644
--- a/modules/common/dap_chain_datum.c
+++ b/modules/common/dap_chain_datum.c
@@ -310,6 +310,7 @@ bool dap_chain_datum_dump_tx(dap_chain_datum_tx_t *a_datum,
((dap_chain_datum_tx_receipt_t*)item)->receipt_info.value_datoshi);
char *l_coins_str = dap_chain_balance_to_coins(
((dap_chain_datum_tx_receipt_t*)item)->receipt_info.value_datoshi);
+ serv_unit_enum_t l_unit = ((dap_chain_datum_tx_receipt_t*)item)->receipt_info.units_type.enm;
dap_string_append_printf(a_str_out, "\t Receipt:\n"
"\t\t size: %"DAP_UINT64_FORMAT_U"\n"
"\t\t ext size: %"DAP_UINT64_FORMAT_U"\n"
@@ -322,8 +323,7 @@ bool dap_chain_datum_dump_tx(dap_chain_datum_tx_t *a_datum,
((dap_chain_datum_tx_receipt_t*)item)->exts_size,
((dap_chain_datum_tx_receipt_t*)item)->receipt_info.units,
((dap_chain_datum_tx_receipt_t*)item)->receipt_info.srv_uid.uint64,
- serv_unit_enum_to_str(
- &((dap_chain_datum_tx_receipt_t*)item)->receipt_info.units_type.enm),
+ serv_unit_enum_to_str(&l_unit),
l_coins_str,
l_value_str);
if (((dap_chain_datum_tx_receipt_t*)item)->exts_size == sizeof(dap_sign_t) + sizeof(dap_sign_t)){
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index b7be1723e8..fb265feb74 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -444,7 +444,7 @@ void dap_chain_net_sync_gdb_broadcast(void *a_arg, const char a_op_code, const c
dap_chain_net_t *l_net = (dap_chain_net_t *)a_arg;
if (!HASH_COUNT(PVT(l_net)->downlinks))
return;
- if (PVT(l_net)->state == NET_STATE_ONLINE) {
+ if (PVT(l_net)->state >= NET_STATE_LINKS_ESTABLISHED && PVT(l_net)->state != NET_STATE_SYNC_GDB) {
dap_store_obj_t *l_obj = NULL;
if (a_op_code == DAP_DB$K_OPTYPE_DEL) {
char *l_group = dap_strdup_printf("%s.del", a_group);
@@ -571,7 +571,7 @@ static void s_chain_callback_notify(void * a_arg, dap_chain_t *a_chain, dap_chai
if (!a_arg)
return;
dap_chain_net_t *l_net = (dap_chain_net_t *)a_arg;
- if (PVT(l_net)->state == NET_STATE_ONLINE) {
+ if (PVT(l_net)->state >= NET_STATE_LINKS_ESTABLISHED && PVT(l_net)->state != NET_STATE_SYNC_CHAINS) {
pthread_rwlock_rdlock(&PVT(l_net)->rwlock);
struct downlink *l_link, *l_tmp;
HASH_ITER(hh, PVT(l_net)->downlinks, l_link, l_tmp) {
@@ -1404,7 +1404,7 @@ static dap_chain_net_t *s_net_new(const char * a_id, const char * a_name ,
PVT(ret)->state_proc_cond = CreateEventA( NULL, FALSE, FALSE, NULL );
#endif
- if (sscanf(a_id,"0x%016"DAP_UINT64_FORMAT_X, &ret->pub.id.uint64 ) != 1) {
+ if (dap_sscanf(a_id,"0x%016"DAP_UINT64_FORMAT_X, &ret->pub.id.uint64 ) != 1) {
log_it (L_ERROR, "Wrong id format (\"%s\"). Must be like \"0x0123456789ABCDE\"" , a_id );
DAP_DELETE(ret);
return NULL;
diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c
index d4eb184cfc..921281b9db 100644
--- a/modules/net/dap_chain_node_cli.c
+++ b/modules/net/dap_chain_node_cli.c
@@ -1070,11 +1070,11 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
dap_chain_node_cli_cmd_item_create ("chain_ca_pub", com_chain_ca_pub,
"Add pubic certificate into the mempool to prepare its way to chains",
- "chain_ca -net <net name> [-chain <chain name>] -ca_name <Certificate name>\n");
+ "chain_ca_pub -net <net name> [-chain <chain name>] -ca_name <Certificate name>\n");
dap_chain_node_cli_cmd_item_create ("chain_ca_copy", com_chain_ca_copy,
"Copy pubic certificate into the mempool to prepare its way to chains",
- "chain_ca -net <net name> [-chain <chain name>] -ca_name <Public certificate name>\n");
+ "chain_ca_copy -net <net name> [-chain <chain name>] -ca_name <Public certificate name>\n");
// Transaction commands
dap_chain_node_cli_cmd_item_create ("tx_create", com_tx_create, "Make transaction",
diff --git a/modules/service/vpn/dap_chain_net_vpn_client.c b/modules/service/vpn/dap_chain_net_vpn_client.c
index 4f1b396672..3246500704 100644
--- a/modules/service/vpn/dap_chain_net_vpn_client.c
+++ b/modules/service/vpn/dap_chain_net_vpn_client.c
@@ -558,7 +558,8 @@ int dap_chain_net_vpn_client_check(dap_chain_net_t *a_net, const char *a_ipv4_st
if(a_ipv4_str)
memcpy(l_request->ip_recv, a_ipv4_str, min(sizeof(l_request->ip_recv), strlen(a_ipv4_str)));
l_request->time_connect_ms = l_dtime_connect_ms;
- gettimeofday(&l_request->send_time1, NULL);
+ gettimeofday(&l_t, NULL);
+ l_t = l_request->send_time1;
size_t l_request_size = l_request->data_size + sizeof(dap_stream_ch_chain_net_srv_pkt_test_t);
dap_stream_ch_pkt_write_unsafe(l_ch, DAP_STREAM_CH_CHAIN_NET_SRV_PKT_TYPE_CHECK_REQUEST, l_request, l_request_size);
dap_stream_ch_set_ready_to_write_unsafe(l_ch, true);
--
GitLab