From 91bb76474296f35de1ac384ee3ba4c7891036c44 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Thu, 21 Oct 2021 15:06:49 +0300
Subject: [PATCH] [*] Massive windows related fixes
---
3rdparty/cuttdb/src/cdb_errno.c | 4 +-
dap-sdk/core/include/dap_common.h | 37 ++++---
dap-sdk/core/src/dap_circular_buffer.c | 2 +-
dap-sdk/core/src/dap_config.c | 4 +-
dap-sdk/core/src/win32/dap_cpu_monitor.c | 7 +-
dap-sdk/crypto/src/dap_cert.c | 12 +--
dap-sdk/crypto/src/dap_cert_file.c | 4 +-
dap-sdk/crypto/src/dap_enc_bf.c | 4 +-
dap-sdk/crypto/src/dap_enc_dilithium.c | 2 +-
dap-sdk/crypto/src/dap_enc_iaes.c | 2 +-
dap-sdk/crypto/src/dap_enc_key.c | 2 +-
dap-sdk/crypto/src/dap_hash.c | 8 +-
dap-sdk/net/client/dap_client_http.c | 25 ++---
dap-sdk/net/client/dap_client_pvt.c | 42 ++++----
dap-sdk/net/core/dap_events_socket.c | 47 +++++----
dap-sdk/net/core/dap_proc_thread.c | 10 +-
dap-sdk/net/core/dap_server.c | 8 +-
dap-sdk/net/core/dap_timerfd.c | 4 +-
dap-sdk/net/core/dap_worker.c | 65 ++++++------
dap-sdk/net/core/include/dap_events_socket.h | 6 +-
dap-sdk/net/server/enc_server/dap_enc_http.c | 7 +-
.../net/server/http_server/dap_http_simple.c | 8 +-
.../http_server/http_client/dap_http_client.c | 21 ++--
.../json_rpc/include/dap_json_rpc_request.h | 2 +-
.../include/dap_json_rpc_request_handler.h | 2 +-
.../json_rpc/src/dap_json_rpc_notification.c | 2 +-
.../json_rpc/src/dap_json_rpc_request.c | 4 +-
.../src/dap_json_rpc_response_handler.c | 8 +-
.../server/notify_server/src/dap_notify_srv.c | 4 +-
dap-sdk/net/stream/ch/dap_stream_ch_pkt.c | 4 +-
dap-sdk/net/stream/stream/dap_stream.c | 18 ++--
dap-sdk/net/stream/stream/dap_stream_pkt.c | 2 +-
dap-sdk/net/stream/stream/dap_stream_worker.c | 2 +-
modules/app-cli/dap_app_cli.c | 2 +-
modules/app-cli/dap_app_cli_shell.c | 3 +-
modules/chain/dap_chain.c | 12 +--
modules/chain/dap_chain_cell.c | 22 ++---
modules/chain/dap_chain_ledger.c | 45 ++++-----
.../dap_stream_ch_chain_net_srv.c | 8 +-
.../chain-net/dap_stream_ch_chain_net.c | 8 +-
modules/channel/chain/dap_stream_ch_chain.c | 98 ++++++++++---------
modules/common/dap_chain_common.c | 9 +-
modules/common/dap_chain_datum_token.c | 2 +-
modules/common/dap_chain_datum_tx_receipt.c | 2 +-
.../consensus/dag-poa/dap_chain_cs_dag_poa.c | 2 +-
.../consensus/dag-pos/dap_chain_cs_dag_pos.c | 10 +-
modules/consensus/none/dap_chain_cs_none.c | 2 +-
modules/mempool/dap_chain_mempool.c | 8 +-
modules/net/dap_chain_net.c | 24 ++---
modules/net/dap_chain_node.c | 2 +-
modules/net/dap_chain_node_cli.c | 20 ++--
modules/net/dap_chain_node_cli_cmd.c | 16 +--
modules/net/dap_chain_node_cli_cmd_tx.c | 8 +-
modules/net/dap_chain_node_client.c | 2 +-
modules/net/dap_chain_node_ping.c | 8 +-
modules/net/include/dap_chain_node_cli.h | 3 +-
modules/net/srv/dap_chain_net_srv.c | 2 +-
modules/net/srv/libmaxminddb/mmdblookup.c | 8 +-
.../service/stake/dap_chain_net_srv_stake.c | 2 +-
.../xchange/dap_chain_net_srv_xchange.c | 2 +-
modules/type/blocks/dap_chain_block.c | 38 +++----
modules/type/blocks/dap_chain_cs_blocks.c | 4 +-
modules/type/dag/dap_chain_cs_dag.c | 21 ++--
modules/wallet/dap_chain_wallet.c | 4 +-
modules/wallet/include/dap_chain_wallet.h | 2 +-
65 files changed, 397 insertions(+), 381 deletions(-)
diff --git a/3rdparty/cuttdb/src/cdb_errno.c b/3rdparty/cuttdb/src/cdb_errno.c
index 432d154ac4..0e9765acce 100644
--- a/3rdparty/cuttdb/src/cdb_errno.c
+++ b/3rdparty/cuttdb/src/cdb_errno.c
@@ -22,7 +22,7 @@
int cdb_errno(CDB *db)
{
- return (long)pthread_getspecific(*(pthread_key_t*)db->errkey);
+ return (size_t)pthread_getspecific(*(pthread_key_t*)db->errkey);
}
const char *cdb_errmsg(int ecode)
@@ -71,7 +71,7 @@ void cdb_seterrcb(CDB *db, CDB_ERRCALLBACK errcb, void *arg)
void cdb_seterrno(CDB *db, int ecode, const char *source, int line)
{
- pthread_setspecific(*(pthread_key_t*)db->errkey, (void*)(long)ecode);
+ pthread_setspecific(*(pthread_key_t*)db->errkey, (void*)(size_t)ecode);
if (ecode != CDB_SUCCESS && db->errcb) {
db->errcb(db->errcbarg, ecode, source, line);
}
diff --git a/dap-sdk/core/include/dap_common.h b/dap-sdk/core/include/dap_common.h
index 9a02eaee64..8824db6351 100755
--- a/dap-sdk/core/include/dap_common.h
+++ b/dap-sdk/core/include/dap_common.h
@@ -193,24 +193,24 @@ DAP_STATIC_INLINE void _dap_aligned_free( void *ptr )
#define DAP_UINT64_FORMAT_X "lX"
#define DAP_UINT64_FORMAT_x "lx"
#define DAP_UINT64_FORMAT_U "lu"
-#define DAP_UINT32_FORMAT_X "X"
-#define DAP_UINT32_FORMAT_x "x"
-#define DAP_UINT32_FORMAT_U "u"
-#define DAP_SIZET_FORMAT_Z "lu"
#elif __SIZEOF_LONG__==4
#define DAP_UINT64_FORMAT_X "llX"
#define DAP_UINT64_FORMAT_x "llx"
#define DAP_UINT64_FORMAT_U "llu"
-#define DAP_UINT32_FORMAT_X "lX"
-#define DAP_UINT32_FORMAT_x "lx"
-#define DAP_UINT32_FORMAT_U "lu"
+#else
+#error "DAP_UINT64_FORMAT_* are undefined for your platform"
+#endif
+
#ifdef DAP_OS_WINDOWS
-#define DAP_SIZET_FORMAT_Z "I64u"
+#ifdef _WIN64
+#define DAP_FORMAT_SOCKET "llu"
#else
-#define DAP_SIZET_FORMAT_Z "llu"
+#define DAP_FORMAT_SOCKET "lu"
#endif
+#define DAP_FORMAT_HANDLE "p"
#else
-#error "DAP_UINT64_FORMAT_* are undefined for your platform"
+#define DAP_FORMAT_SOCKET "n"
+#define DAP_FORMAT_HANDLE "n"
#endif
#ifndef LOWORD
@@ -439,11 +439,20 @@ void dap_log_set_max_item(unsigned int a_max);
// get logs from list
char *dap_log_get_item(time_t a_start_time, int a_limit);
-void _log_it( const char * log_tag, enum dap_log_level, const char * format,... );
-#define log_it( _log_level, ...) _log_it( LOG_TAG, _log_level, ##__VA_ARGS__)
-//void _vlog_it( const char * log_tag, uint32_t taglen, enum dap_log_level, const char * format, va_list ap );
+#if defined __GNUC__ || defined __clang__
+#ifdef __MINGW_PRINTF_FORMAT
+#define DAP_PRINTF_ATTR(format_index, args_index) \
+ __attribute__ ((format (gnu_printf, format_index, args_index)))
+#else
+#define DAP_PRINTF_ATTR(format_index, args_index) \
+ __attribute__ ((format (printf, format_index, args_index)))
+#endif
+#else /* __GNUC__ */
+#define DAP_PRINTF_ATTR(format_index, args_index)
+#endif /* __GNUC__ */
-//#define vlog_it( a_log_level, a_format, a_ap ) _vlog_it( LOG_TAG, sizeof(LOG_TAG)-1, a_log_level, a_format, a_ap )
+DAP_PRINTF_ATTR(3, 4) void _log_it( const char * log_tag, enum dap_log_level, const char * format, ... );
+#define log_it( _log_level, ...) _log_it( LOG_TAG, _log_level, ##__VA_ARGS__)
const char * log_error(void);
void dap_log_level_set(enum dap_log_level ll);
diff --git a/dap-sdk/core/src/dap_circular_buffer.c b/dap-sdk/core/src/dap_circular_buffer.c
index 5aaf60c648..8e62caf4d3 100755
--- a/dap-sdk/core/src/dap_circular_buffer.c
+++ b/dap-sdk/core/src/dap_circular_buffer.c
@@ -340,7 +340,7 @@ void circular_buffer_print(circular_buffer_t cBuf, bool hex)
dap_sprintf(str+i*2, "%c|",c);
}
- printf("CircularBuffer: %s <size %"DAP_SIZET_FORMAT_Z" dataSize:%"DAP_SIZET_FORMAT_Z">\n",
+ dap_printf("CircularBuffer: %s <size %zu dataSize:%zu>\n",
str,circular_buffer_get_capacity(cBuf),circular_buffer_get_data_size(cBuf));
free(str);
diff --git a/dap-sdk/core/src/dap_config.c b/dap-sdk/core/src/dap_config.c
index 37e59e489e..f848b34867 100755
--- a/dap-sdk/core/src/dap_config.c
+++ b/dap-sdk/core/src/dap_config.c
@@ -184,7 +184,7 @@ dap_config_t * dap_config_open(const char * a_name)
l_param_name_size = j;
if (l_param_name_size > (sizeof(l_param_name) -1) ){
l_param_name_size = (sizeof(l_param_name) - 1 );
- log_it(L_WARNING,"Too long param name in config, %u is more than %u maximum",
+ log_it(L_WARNING,"Too long param name in config, %zu is more than %zu maximum",
j,sizeof(l_param_name) -1);
}
strncpy(l_param_name,l_line,j);
@@ -203,7 +203,7 @@ dap_config_t * dap_config_open(const char * a_name)
if (l_param_value_size ){
if (l_param_value_size > (sizeof(l_param_value) -1) ){
l_param_value_size = (sizeof(l_param_value) - 1 );
- log_it(L_WARNING,"Too long param value in config, %u is more than %u maximum",
+ log_it(L_WARNING,"Too long param value in config, %zu is more than %zu maximum",
l_line_length - j,sizeof(l_param_value) -1);
}
strncpy(l_param_value,l_line +j, l_param_value_size);
diff --git a/dap-sdk/core/src/win32/dap_cpu_monitor.c b/dap-sdk/core/src/win32/dap_cpu_monitor.c
index 1857e8f408..68e80f290c 100644
--- a/dap-sdk/core/src/win32/dap_cpu_monitor.c
+++ b/dap-sdk/core/src/win32/dap_cpu_monitor.c
@@ -35,7 +35,7 @@
//static FILE * _proc_stat = NULL;
static dap_cpu_stats_t _cpu_stats = {0};
-static dap_cpu_t _cpu_old_stats[MAX_CPU_COUNT] = {0};
+static dap_cpu_t _cpu_old_stats[MAX_CPU_COUNT] = {};
static dap_cpu_t _cpu_summary_old = {0};
typedef struct proc_stat_line
@@ -103,12 +103,11 @@ dap_cpu_stats_t dap_cpu_get_stats()
/*********************************************/
SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION pinfo[64];
- ULONG outsize;
- uint32_t ntstatus_error;
+ ULONG outsize = 0;
+ uint32_t ntstatus_error = 0;
/*ntstatus_error = NtQuerySystemInformation( SystemProcessorPerformanceInformation, &pinfo,
sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * 64, &outsize );*/ // ! ! ! Legacy method, must be replaced
- ntstatus_error = 0;
if ( ntstatus_error ) {
log_it(L_ERROR, "NtQuerySystemInformation returned an error %u", ntstatus_error );
diff --git a/dap-sdk/crypto/src/dap_cert.c b/dap-sdk/crypto/src/dap_cert.c
index 6d3d082906..d2ef8b65c1 100755
--- a/dap-sdk/crypto/src/dap_cert.c
+++ b/dap-sdk/crypto/src/dap_cert.c
@@ -453,13 +453,13 @@ size_t dap_cert_count_cert_sign(dap_cert_t * a_cert)
*/
void dap_cert_dump(dap_cert_t * a_cert)
{
- printf ("Certificate name: %s\n",a_cert->name);
- printf ("Signature type: %s\n", dap_sign_type_to_str( dap_sign_type_from_key_type(a_cert->enc_key->type) ) );
- printf ("Private key size: %"DAP_SIZET_FORMAT_Z"\n",a_cert->enc_key->priv_key_data_size);
- printf ("Public key size: %"DAP_SIZET_FORMAT_Z"\n", a_cert->enc_key->pub_key_data_size);
+ dap_printf ("Certificate name: %s\n",a_cert->name);
+ dap_printf ("Signature type: %s\n", dap_sign_type_to_str( dap_sign_type_from_key_type(a_cert->enc_key->type) ) );
+ dap_printf ("Private key size: %zu\n",a_cert->enc_key->priv_key_data_size);
+ dap_printf ("Public key size: %zu\n", a_cert->enc_key->pub_key_data_size);
size_t l_meta_items_cnt = dap_binary_tree_count(a_cert->metadata);
- printf ("Metadata section count: %"DAP_SIZET_FORMAT_Z"\n", l_meta_items_cnt);
- printf ("Certificates signatures chain size: %"DAP_SIZET_FORMAT_Z"\n",dap_cert_count_cert_sign (a_cert));
+ dap_printf ("Metadata section count: %zu\n", l_meta_items_cnt);
+ dap_printf ("Certificates signatures chain size: %zu\n",dap_cert_count_cert_sign (a_cert));
if (l_meta_items_cnt) {
printf ("Metadata sections\n");
dap_list_t *l_meta_list = dap_binary_tree_inorder_list(a_cert->metadata);
diff --git a/dap-sdk/crypto/src/dap_cert_file.c b/dap-sdk/crypto/src/dap_cert_file.c
index c47e0a51c3..971677a66c 100755
--- a/dap-sdk/crypto/src/dap_cert_file.c
+++ b/dap-sdk/crypto/src/dap_cert_file.c
@@ -54,7 +54,7 @@ int dap_cert_file_save(dap_cert_t * a_cert, const char * a_cert_file_path)
if ( l_data ){
size_t l_retbytes;
if ( (l_retbytes = fwrite(l_data,1,l_data_size,l_file)) != l_data_size ){
- log_it(L_ERROR, "Can't write %u bytes on disk (processed only %u)!", l_data_size,l_retbytes);
+ log_it(L_ERROR, "Can't write %u bytes on disk (processed only %zu)!", l_data_size,l_retbytes);
return -3;
}
fclose(l_file);
@@ -343,7 +343,7 @@ dap_cert_t* dap_cert_file_load(const char * a_cert_file_path)
rewind(l_file);
uint8_t * l_data = DAP_NEW_SIZE(uint8_t,l_file_size);
if ( fread(l_data,1,l_file_size,l_file ) != l_file_size ){
- log_it(L_ERROR, "Can't read %u bytes from the disk!", l_file_size);
+ log_it(L_ERROR, "Can't read %"DAP_UINT64_FORMAT_U" bytes from the disk!", l_file_size);
DAP_DELETE (l_data);
goto lb_exit;
}else{
diff --git a/dap-sdk/crypto/src/dap_enc_bf.c b/dap-sdk/crypto/src/dap_enc_bf.c
index 86681c1649..2a5b78d8fb 100644
--- a/dap-sdk/crypto/src/dap_enc_bf.c
+++ b/dap-sdk/crypto/src/dap_enc_bf.c
@@ -116,7 +116,7 @@ size_t dap_enc_bf_cbc_decrypt_fast(struct dap_enc_key *a_key, const void * a_in,
int bf_cbc_padding_length = *(uint8_t*)(a_out + a_in_size - BLOWFISH_BLOCK_SIZE - 1);
size_t a_out_size = *(uint32_t*)(a_out + a_in_size - BLOWFISH_BLOCK_SIZE - 1 - bf_cbc_padding_length - 4);
if (a_out_size > a_in_size + BLOWFISH_BLOCK_SIZE) {
- log_it(L_WARNING, "blowfish_cbc decryption out size %d too big", a_out_size);
+ log_it(L_WARNING, "blowfish_cbc decryption out size %zu too big", a_out_size);
return a_in_size + BLOWFISH_BLOCK_SIZE;
}
return a_out_size;
@@ -129,7 +129,7 @@ size_t dap_enc_bf_cbc_encrypt_fast(struct dap_enc_key * a_key, const void * a_in
//generate iv and put it in *a_out first bytes
size_t a_out_size = (a_in_size + 4 + 1 + BLOWFISH_BLOCK_SIZE-1)/BLOWFISH_BLOCK_SIZE*BLOWFISH_BLOCK_SIZE + BLOWFISH_BLOCK_SIZE;
if(a_out_size > buf_out_size) {
- log_it(L_ERROR, "blowfish_cbc fast_encryption too small buf_out_size, %d < %d", buf_out_size, a_out_size);
+ log_it(L_ERROR, "blowfish_cbc fast_encryption too small buf_out_size, %zu < %zu", buf_out_size, a_out_size);
return 0;
}
diff --git a/dap-sdk/crypto/src/dap_enc_dilithium.c b/dap-sdk/crypto/src/dap_enc_dilithium.c
index aa9821f1bc..566cf18c83 100755
--- a/dap-sdk/crypto/src/dap_enc_dilithium.c
+++ b/dap-sdk/crypto/src/dap_enc_dilithium.c
@@ -561,7 +561,7 @@ dilithium_public_key_t* dap_enc_dilithium_read_public_key_old2(const uint8_t *a_
return NULL;
dilithium_param_t p;
if(!dilithium_params_init(&p,(dilithium_kind_t) kind)){
- log_it(L_ERROR,"::read_public_key_old2() Can't find params for signature kind %d", kind);
+ log_it(L_ERROR,"::read_public_key_old2() Can't find params for signature kind %zu", kind);
return NULL;
}
diff --git a/dap-sdk/crypto/src/dap_enc_iaes.c b/dap-sdk/crypto/src/dap_enc_iaes.c
index 29ef751860..e9652a63a6 100755
--- a/dap-sdk/crypto/src/dap_enc_iaes.c
+++ b/dap-sdk/crypto/src/dap_enc_iaes.c
@@ -126,7 +126,7 @@ size_t dap_enc_iaes256_cbc_decrypt_fast(struct dap_enc_key * a_key, const void *
size_t l_padding_size = ((uint8_t *)data)[a_in_size - 1];
if(l_padding_size > a_in_size){
- log_it(L_WARNING, "%s: padding size is %u while whole message is just %u", __PRETTY_FUNCTION__, l_padding_size, a_in_size);
+ log_it(L_WARNING, "%s: padding size is %zu while whole message is just %zu", __PRETTY_FUNCTION__, l_padding_size, a_in_size);
return 0;
}else{
return a_in_size - l_padding_size;
diff --git a/dap-sdk/crypto/src/dap_enc_key.c b/dap-sdk/crypto/src/dap_enc_key.c
index db75d707d3..9cbca73323 100755
--- a/dap-sdk/crypto/src/dap_enc_key.c
+++ b/dap-sdk/crypto/src/dap_enc_key.c
@@ -727,7 +727,7 @@ dap_enc_key_t* dap_enc_key_dup(dap_enc_key_t * a_key)
dap_enc_key_t* dap_enc_key_deserealize(const void *buf, size_t buf_size)
{
if(buf_size != sizeof (dap_enc_key_serealize_t)) {
- log_it(L_ERROR, "Key can't be deserealize. buf_size(%d) != sizeof (dap_enc_key_serealize_t)(%d)",buf_size,sizeof (dap_enc_key_serealize_t));
+ log_it(L_ERROR, "Key can't be deserealize. buf_size(%zu) != sizeof (dap_enc_key_serealize_t)(%zu)",buf_size,sizeof (dap_enc_key_serealize_t));
return NULL;
}
const dap_enc_key_serealize_t *in_key = (const dap_enc_key_serealize_t *)buf;
diff --git a/dap-sdk/crypto/src/dap_hash.c b/dap-sdk/crypto/src/dap_hash.c
index 9360ef298b..a826d81f6f 100755
--- a/dap-sdk/crypto/src/dap_hash.c
+++ b/dap-sdk/crypto/src/dap_hash.c
@@ -43,13 +43,15 @@ int dap_chain_hash_fast_from_str( const char * a_hash_str, dap_chain_hash_fast_t
size_t l_hash_str_len = strlen( a_hash_str);
if ( l_hash_str_len + 1 == c_hash_str_size ){
for(size_t l_offset = 2; l_offset < l_hash_str_len; l_offset += 2) {
- if(sscanf(a_hash_str + l_offset, "%02hhx", a_hash->raw + l_offset / 2 - 1) != 1) {
- if(sscanf(a_hash_str + l_offset, "%02hhX", a_hash->raw + l_offset / 2 - 1) != 1) {
- log_it(L_ERROR, "dap_chain_str_to_hash_fast parse error: offset=%u, hash_str_len=%u, str=\"%2s\"",
+ char l_byte;
+ if(dap_sscanf(a_hash_str + l_offset, "%02hhx", &l_byte) != 1) {
+ if(dap_sscanf(a_hash_str + l_offset, "%02hhx", &l_byte) != 1) {
+ log_it(L_ERROR, "dap_chain_str_to_hash_fast parse error: offset=%zu, hash_str_len=%zu, str=\"%2s\"",
l_offset, l_hash_str_len, a_hash_str + l_offset);
return -10 * ((int) l_offset); // Wrong char
}
}
+ *(a_hash->raw + l_offset / 2 - 1) = l_byte;
}
return 0;
}else // Wromg string len
diff --git a/dap-sdk/net/client/dap_client_http.c b/dap-sdk/net/client/dap_client_http.c
index c1ebf56430..f7be8f8e02 100644
--- a/dap-sdk/net/client/dap_client_http.c
+++ b/dap-sdk/net/client/dap_client_http.c
@@ -85,8 +85,10 @@ typedef struct dap_http_client_internal {
#define PVT(a) (a ? (dap_client_http_pvt_t *) (a)->_inheritor : NULL)
-static void s_http_connected(dap_events_socket_t * a_esocket); // Connected callback
+static void s_http_connected(dap_events_socket_t * a_esocket); // Connected
+#ifndef DAP_NET_CLIENT_NO_SSL
static void s_http_ssl_connected(dap_events_socket_t * a_esocket); // connected SSL callback
+#endif
static void s_client_http_delete(dap_client_http_pvt_t * a_http_pvt);
static void s_http_read(dap_events_socket_t * a_es, void * arg);
static void s_http_error(dap_events_socket_t * a_es, int a_arg);
@@ -197,7 +199,7 @@ static bool s_timer_timeout_after_connected_check(void * a_arg)
l_http_pvt->were_callbacks_called = true;
}
l_http_pvt->is_closed_by_timeout = true;
- log_it(L_INFO, "Close %s sock %u type %d by timeout",
+ log_it(L_INFO, "Close %s sock %zu type %d by timeout",
l_es->remote_addr_str ? l_es->remote_addr_str : "", l_es->socket, l_es->type);
dap_events_socket_remove_and_delete_unsafe(l_es, true);
}
@@ -233,12 +235,12 @@ static bool s_timer_timeout_check(void * a_arg)
l_http_pvt->were_callbacks_called = true;
}
l_http_pvt->is_closed_by_timeout = true;
- log_it(L_INFO, "Close %s sock %u type %d by timeout",
+ log_it(L_INFO, "Close %s sock %"DAP_FORMAT_SOCKET" type %d by timeout",
l_es->remote_addr_str ? l_es->remote_addr_str : "", l_es->socket, l_es->type);
dap_events_socket_remove_and_delete_unsafe(l_es, true);
}else
if(s_debug_more)
- log_it(L_DEBUG,"Socket %d is connected, close check timer", l_es->socket);
+ log_it(L_DEBUG,"Socket %zu is connected, close check timer", l_es->socket);
}else
if(s_debug_more)
log_it(L_DEBUG,"Esocket %"DAP_UINT64_FORMAT_U" is finished, close check timer", *l_es_uuid);
@@ -254,6 +256,7 @@ static bool s_timer_timeout_check(void * a_arg)
*/
static void s_http_read(dap_events_socket_t * a_es, void * arg)
{
+ UNUSED(arg);
dap_client_http_pvt_t * l_http_pvt = PVT(a_es);
if(!l_http_pvt) {
log_it(L_ERROR, "s_http_read: l_client_http_internal is NULL!");
@@ -267,7 +270,7 @@ static void s_http_read(dap_events_socket_t * a_es, void * arg)
// if buffer is overfull then read once more
if(l_http_pvt->response_size >= DAP_CLIENT_HTTP_RESPONSE_SIZE_MAX) {
- log_it(L_ERROR, "s_http_read response_size(%d) overfull!!!", l_http_pvt->response_size);
+ log_it(L_ERROR, "s_http_read response_size(%zu) overfull!!!", l_http_pvt->response_size);
}
// search http header
@@ -342,9 +345,9 @@ static void s_http_error(dap_events_socket_t * a_es, int a_errno)
strncpy(l_errbuf,"Unknown Error", sizeof (l_errbuf)-1);
if (a_es->flags & DAP_SOCK_CONNECTING){
- log_it(L_WARNING, "Socket %d connecting error: %s (code %d)" , a_es->socket, l_errbuf, a_errno);
+ log_it(L_WARNING, "Socket %zu connecting error: %s (code %d)" , a_es->socket, l_errbuf, a_errno);
}else
- log_it(L_WARNING, "Socket %d error: %s (code %d)", a_es->socket, l_errbuf, a_errno);
+ log_it(L_WARNING, "Socket %zu error: %s (code %d)", a_es->socket, l_errbuf, a_errno);
dap_client_http_pvt_t * l_client_http_internal = PVT(a_es);
@@ -520,7 +523,7 @@ void* dap_client_http_request_custom(dap_worker_t * a_worker, const char *a_upli
dap_events_socket_t *l_ev_socket = dap_events_socket_wrap_no_add(dap_events_get_default(), l_socket, &l_s_callbacks);
- log_it(L_DEBUG,"Created client request socket %d", l_socket);
+ log_it(L_DEBUG,"Created client request socket %zu", l_socket);
// create private struct
dap_client_http_pvt_t *l_http_pvt = DAP_NEW_Z(dap_client_http_pvt_t);
l_ev_socket->_inheritor = l_http_pvt;
@@ -605,7 +608,7 @@ void* dap_client_http_request_custom(dap_worker_t * a_worker, const char *a_upli
}
return l_http_pvt;
} else {
- log_it(L_ERROR, "Socket %d connecting error: %d", l_ev_socket->socket, l_err2);
+ log_it(L_ERROR, "Socket %zu connecting error: %d", l_ev_socket->socket, l_err2);
s_client_http_delete( l_http_pvt);
l_ev_socket->_inheritor = NULL;
dap_events_socket_delete_unsafe( l_ev_socket, true);
@@ -681,7 +684,7 @@ static void s_http_connected(dap_events_socket_t * a_esocket)
assert(l_http_pvt);
assert(l_http_pvt->worker);
- log_it(L_INFO, "Remote address connected (%s:%u) with sock_id %d", l_http_pvt->uplink_addr, l_http_pvt->uplink_port, a_esocket->socket);
+ log_it(L_INFO, "Remote address connected (%s:%u) with sock_id %zu", l_http_pvt->uplink_addr, l_http_pvt->uplink_port, a_esocket->socket);
// add to dap_worker
//dap_client_pvt_t * l_client_pvt = (dap_client_pvt_t*) a_obj;
//dap_events_new();
@@ -713,7 +716,7 @@ static void s_http_connected(dap_events_socket_t * a_esocket)
: 0;
// Set request size as Content-Length header
- l_offset += dap_snprintf(l_request_headers + l_offset, l_offset2 -= l_offset, "Content-Length: %"DAP_SIZET_FORMAT_Z"\r\n", l_http_pvt->request_size);
+ l_offset += dap_snprintf(l_request_headers + l_offset, l_offset2 -= l_offset, "Content-Length: %zu\r\n", l_http_pvt->request_size);
}
// adding string for GET request
diff --git a/dap-sdk/net/client/dap_client_pvt.c b/dap-sdk/net/client/dap_client_pvt.c
index c24307df3b..2cea94f5b6 100644
--- a/dap-sdk/net/client/dap_client_pvt.c
+++ b/dap-sdk/net/client/dap_client_pvt.c
@@ -170,7 +170,7 @@ void dap_client_pvt_delete(dap_client_pvt_t * a_client_pvt)
if (!dap_client_pvt_find(a_client_pvt->uuid)) {
if(s_debug_more)
- log_it(L_DEBUG, "dap_client_pvt 0x%x already deleted", a_client_pvt);
+ log_it(L_DEBUG, "dap_client_pvt 0x%p already deleted", a_client_pvt);
return;
}
if(a_client_pvt->delete_callback)
@@ -181,7 +181,7 @@ void dap_client_pvt_delete(dap_client_pvt_t * a_client_pvt)
// delete from list
dap_client_pvt_hh_del_unsafe(a_client_pvt);
if(s_debug_more)
- log_it(L_INFO, "dap_client_pvt_delete 0x%x", a_client_pvt);
+ log_it(L_INFO, "dap_client_pvt_delete 0x%p", a_client_pvt);
if(a_client_pvt->uplink_addr)
DAP_DELETE(a_client_pvt->uplink_addr);
@@ -210,7 +210,7 @@ void dap_client_pvt_delete(dap_client_pvt_t * a_client_pvt)
*/
static void s_stream_connected(dap_client_pvt_t * a_client_pvt)
{
- log_it(L_INFO, "Remote address connected for streaming on (%s:%u) with sock_id %d (assign on worker #%u)", a_client_pvt->uplink_addr,
+ log_it(L_INFO, "Remote address connected for streaming on (%s:%u) with sock_id %zu (assign on worker #%u)", a_client_pvt->uplink_addr,
a_client_pvt->uplink_port, a_client_pvt->stream_socket, a_client_pvt->stream_worker->worker->id);
a_client_pvt->stage_status = STAGE_STATUS_DONE;
s_stage_status_after(a_client_pvt);
@@ -218,7 +218,7 @@ static void s_stream_connected(dap_client_pvt_t * a_client_pvt)
assert(a_client_pvt->stream_es);
*l_es_uuid_ptr = a_client_pvt->stream_es->uuid;
if( dap_timerfd_start_on_worker(a_client_pvt->stream_es->worker, s_client_timeout_read_after_connect_seconds * 1000, s_stream_timer_timeout_after_connected_check ,l_es_uuid_ptr) == NULL ){
- log_it(L_ERROR,"Can't run timer for stream after connect check for esocket uuid %"DAP_UINT64_FORMAT_U" ");
+ log_it(L_ERROR,"Can't run timer for stream after connect check for esocket uuid %"DAP_UINT64_FORMAT_U, *l_es_uuid_ptr);
DAP_DEL_Z(l_es_uuid_ptr);
}
}
@@ -246,7 +246,7 @@ static bool s_stream_timer_timeout_check(void * a_arg)
if(l_es->callbacks.error_callback) {
l_es->callbacks.error_callback(l_es,ETIMEDOUT);
}
- log_it(L_INFO, "Close %s sock %u type %d by timeout",
+ log_it(L_INFO, "Close %s sock %zu type %d by timeout",
l_es->remote_addr_str ? l_es->remote_addr_str : "", l_es->socket, l_es->type);
dap_client_delete_unsafe(l_client_pvt->client);
} else {
@@ -255,7 +255,7 @@ static bool s_stream_timer_timeout_check(void * a_arg)
}
}else
if(s_debug_more)
- log_it(L_DEBUG,"Socket %d is connected, close check timer", l_es->socket);
+ log_it(L_DEBUG,"Socket %zu is connected, close check timer", l_es->socket);
}else
if(s_debug_more)
log_it(L_DEBUG,"Esocket %"DAP_UINT64_FORMAT_U" is finished, close check timer", *l_es_uuid_ptr);
@@ -289,12 +289,12 @@ static bool s_stream_timer_timeout_after_connected_check(void * a_arg)
if(l_es->callbacks.error_callback) {
l_es->callbacks.error_callback(l_es,ETIMEDOUT);
}
- log_it(L_INFO, "Close streaming socket %s by timeout",
+ log_it(L_INFO, "Close streaming socket %s (%zu) by timeout",
l_es->remote_addr_str ? l_es->remote_addr_str : "", l_es->socket);
dap_client_delete_unsafe(l_client_pvt->client);
}else
if(s_debug_more)
- log_it(L_DEBUG,"Streaming socket %d is connected, close check timer", l_es->socket);
+ log_it(L_DEBUG,"Streaming socket %zu is connected, close check timer", l_es->socket);
} else {
log_it(L_ERROR,"Activity timeout for unexistent client");
dap_events_socket_remove_and_delete_unsafe(l_es,true);
@@ -396,7 +396,7 @@ static bool s_stage_status_after(dap_client_pvt_t * a_client_pvt)
// DAP_ENC_DATA_TYPE_B64_URLSAFE not need because send it by POST request
size_t l_data_str_enc_size = dap_enc_base64_encode(l_data, l_key_size + l_sign_size, l_data_str, DAP_ENC_DATA_TYPE_B64);
if(s_debug_more)
- log_it(L_DEBUG, "ENC request size %u", l_data_str_enc_size);
+ log_it(L_DEBUG, "ENC request size %zu", l_data_str_enc_size);
char l_enc_init_url[1024] = { '\0' };
dap_snprintf(l_enc_init_url, sizeof(l_enc_init_url), DAP_UPLINK_PATH_ENC_INIT
@@ -416,7 +416,7 @@ static bool s_stage_status_after(dap_client_pvt_t * a_client_pvt)
char *l_request = dap_strdup_printf("%d", DAP_CLIENT_PROTOCOL_VERSION);
size_t l_request_size = dap_strlen(l_request);
if(s_debug_more)
- log_it(L_DEBUG, "STREAM_CTL request size %u", strlen(l_request));
+ log_it(L_DEBUG, "STREAM_CTL request size %zu", strlen(l_request));
char *l_suburl;
@@ -462,10 +462,8 @@ static bool s_stage_status_after(dap_client_pvt_t * a_client_pvt)
#ifdef DAP_OS_WINDOWS
u_long l_socket_flags = 1;
if (ioctlsocket(a_client_pvt->stream_socket, (long)FIONBIO, &l_socket_flags) == SOCKET_ERROR) {
- log_it(L_ERROR, "Can't set socket %d to nonblocking mode, error %d", a_client_pvt->stream_socket, WSAGetLastError());
+ log_it(L_ERROR, "Can't set socket %zu to nonblocking mode, error %d", a_client_pvt->stream_socket, WSAGetLastError());
}
- int buffsize = 0x40000;
- int optsize = sizeof( int );
#else
// Get socket flags
int l_socket_flags = fcntl(a_client_pvt->stream_socket, F_GETFL);
@@ -538,8 +536,8 @@ static bool s_stage_status_after(dap_client_pvt_t * a_client_pvt)
strerror_r(l_err,l_errbuf,sizeof (l_errbuf));
else
strncpy(l_errbuf,"Unknown Error",sizeof(l_errbuf)-1);
- log_it(L_ERROR, "Remote address can't connect (%s:%u) with sock_id %d: \"%s\" (code %d)", a_client_pvt->uplink_addr,
- a_client_pvt->uplink_port, l_errbuf, l_err);
+ log_it(L_ERROR, "Remote address can't connect (%s:%hu) with sock_id %zu: \"%s\" (code %d)", a_client_pvt->uplink_addr,
+ a_client_pvt->uplink_port, a_client_pvt->stream_es->socket, l_errbuf, l_err);
#ifdef DAP_OS_WINDOWS
closesocket(a_client_pvt->stream_socket);
#else
@@ -1027,7 +1025,7 @@ static void s_enc_init_response(dap_client_t * a_client, void * a_response, size
dap_client_get_stage_str(a_client), dap_client_get_stage_status_str(a_client));
}
} else {
- log_it(L_ERROR, "ENC: Wrong response (size %u data '%s')", a_response_size, (char* ) a_response);
+ log_it(L_ERROR, "ENC: Wrong response (size %zu data '%s')", a_response_size, (char* ) a_response);
l_client_pvt->last_error = ERROR_ENC_NO_KEY;
l_client_pvt->stage_status = STAGE_STATUS_ERROR;
s_stage_status_after(l_client_pvt);
@@ -1036,12 +1034,12 @@ static void s_enc_init_response(dap_client_t * a_client, void * a_response, size
DAP_DELETE(l_session_id_b64);
DAP_DELETE(l_bob_message_b64);
} else if(a_response_size > 1) {
- log_it(L_ERROR, "ENC: Wrong response (size %u data '%s')", a_response_size, (char* ) a_response);
+ log_it(L_ERROR, "ENC: Wrong response (size %zu data '%s')", a_response_size, (char* ) a_response);
l_client_pvt->last_error = ERROR_ENC_NO_KEY;
l_client_pvt->stage_status = STAGE_STATUS_ERROR;
s_stage_status_after(l_client_pvt);
} else {
- log_it(L_ERROR, "ENC: Wrong response (size %u)", a_response_size);
+ log_it(L_ERROR, "ENC: Wrong response (size %zu)", a_response_size);
l_client_pvt->last_error = ERROR_ENC_NO_KEY;
l_client_pvt->stage_status = STAGE_STATUS_ERROR;
s_stage_status_after(l_client_pvt);
@@ -1078,7 +1076,7 @@ static void s_stream_ctl_response(dap_client_t * a_client, void * a_data, size_t
dap_client_pvt_t *l_client_pvt = dap_client_pvt_find(a_client->pvt_uuid);
if (!l_client_pvt) return;
if(s_debug_more)
- log_it(L_DEBUG, "STREAM_CTL response %u bytes length recieved", a_data_size);
+ log_it(L_DEBUG, "STREAM_CTL response %zu bytes length recieved", a_data_size);
char * l_response_str = DAP_NEW_Z_SIZE(char, a_data_size + 1);
memcpy(l_response_str, a_data, a_data_size);
@@ -1188,7 +1186,7 @@ static void s_stream_response(dap_client_t * a_client, void * a_data, size_t a_d
dap_client_pvt_t * l_client_pvt = DAP_CLIENT_PVT(a_client);
assert(l_client_pvt);
if(s_debug_more)
- log_it(L_DEBUG, "STREAM response %u bytes length recieved", a_data_size);
+ log_it(L_DEBUG, "STREAM response %zu bytes length recieved", a_data_size);
// char * l_response_str = DAP_NEW_Z_SIZE(char, a_data_size + 1);
// memcpy(l_response_str, a_data, a_data_size);
@@ -1249,7 +1247,7 @@ static void s_stream_es_callback_delete(dap_events_socket_t *a_es, void *arg)
}
if(s_debug_more)
- log_it(L_DEBUG, "Delete stream socket for client_pvt=0x%x", l_client_pvt);
+ log_it(L_DEBUG, "Delete stream socket for client_pvt=0x%p", l_client_pvt);
dap_stream_delete(l_client_pvt->stream);
if (l_client_pvt->stream_es) {
@@ -1282,7 +1280,7 @@ static void s_stream_es_callback_read(dap_events_socket_t * a_es, void * arg)
if(l_pos_endl) {
if(*(l_pos_endl + 1) == '\n') {
dap_events_socket_shrink_buf_in(a_es, l_pos_endl - (char*)a_es->buf_in);
- log_it(L_DEBUG, "Header passed, go to streaming (%lu bytes already are in input buffer",
+ log_it(L_DEBUG, "Header passed, go to streaming (%zu bytes already are in input buffer",
a_es->buf_in_size);
l_client_pvt->stage = STAGE_STREAM_STREAMING;
diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c
index 4317deeb59..2ce75c1bb1 100644
--- a/dap-sdk/net/core/dap_events_socket.c
+++ b/dap-sdk/net/core/dap_events_socket.c
@@ -410,7 +410,7 @@ dap_events_socket_t * dap_events_socket_create(dap_events_desc_type_t a_type, da
}
l_es->type = a_type ;
if(s_debug_reactor)
- log_it(L_DEBUG,"Created socket %d type %d", l_sock,l_es->type);
+ log_it(L_DEBUG,"Created socket %"DAP_UINT64_FORMAT_U" type %d", l_sock,l_es->type);
return l_es;
}
@@ -533,13 +533,13 @@ dap_events_socket_t * dap_events_socket_queue_ptr_create_input(dap_events_socket
Sleep(300);
hr = MQOpenQueue(l_direct_name, MQ_SEND_ACCESS, MQ_DENY_NONE, &(l_es->mqh));
if (hr != MQ_OK) {
- log_it(L_ERROR, "Can't open message queue for queue type, error: 0x%x", hr);
+ log_it(L_ERROR, "Can't open message queue for queue type, error: %ld", hr);
return NULL;
}
}
hr = MQOpenQueue(l_direct_name, MQ_RECEIVE_ACCESS, MQ_DENY_NONE, &(l_es->mqh_recv));
if (hr != MQ_OK) {
- log_it(L_ERROR, "Can't open message queue for queue type, error: 0x%x", hr);
+ log_it(L_ERROR, "Can't open message queue for queue type, error: %ld", hr);
return NULL;
}
#elif defined (DAP_EVENTS_CAPS_KQUEUE)
@@ -746,7 +746,7 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc
DWORD l_buflen = sizeof(l_format_name);
HRESULT hr = MQCreateQueue(NULL, &l_qps, l_format_name, &l_buflen);
if ((hr != MQ_OK) && (hr != MQ_ERROR_QUEUE_EXISTS) && (hr != MQ_INFORMATION_PROPERTY)) {
- log_it(L_ERROR, "Can't create message queue for queue type, error: 0x%x", hr);
+ log_it(L_ERROR, "Can't create message queue for queue type, error: %ld", hr);
DAP_DELETE(l_es);
return NULL;
}
@@ -758,7 +758,7 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc
Sleep(300);
hr = MQOpenQueue(l_direct_name, MQ_SEND_ACCESS, MQ_DENY_NONE, &(l_es->mqh));
if (hr != MQ_OK) {
- log_it(L_ERROR, "Can't open message queue for queue type, error: 0x%x", hr);
+ log_it(L_ERROR, "Can't open message queue for queue type, error: %ld", hr);
DAP_DELETE(l_es);
MQDeleteQueue(l_format_name);
return NULL;
@@ -766,7 +766,7 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc
}
hr = MQOpenQueue(l_direct_name, MQ_RECEIVE_ACCESS, MQ_DENY_NONE, &(l_es->mqh_recv));
if (hr != MQ_OK) {
- log_it(L_ERROR, "Can't open message queue for queue type, error: 0x%x", hr);
+ log_it(L_ERROR, "Can't open message queue for queue type, error: %ld", hr);
DAP_DELETE(l_es);
MQCloseQueue(l_es->mqh);
MQDeleteQueue(l_format_name);
@@ -774,7 +774,7 @@ dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_soc
}
hr = MQPurgeQueue(l_es->mqh_recv);
if (hr != MQ_OK) {
- log_it(L_DEBUG, "Message queue %d NOT purged, possible data corruption, err %d", l_es->mq_num, hr);
+ log_it(L_DEBUG, "Message queue %u NOT purged, possible data corruption, err %ld", l_es->mq_num, hr);
}
#elif defined (DAP_EVENTS_CAPS_KQUEUE)
// We don't create descriptor for kqueue at all
@@ -818,7 +818,7 @@ dap_events_socket_t * dap_events_socket_create_type_queue_ptr_unsafe(dap_worker_
#ifdef DAP_OS_WINDOWS
errno = WSAGetLastError();
#endif
- log_it(L_ERROR, "Can't add esocket %d to polling, err %d", l_es->socket, errno);
+ log_it(L_ERROR, "Can't add esocket %zu to polling, err %d", l_es->socket, errno);
}
}
return l_es;
@@ -875,13 +875,13 @@ int dap_events_socket_queue_proc_input_unsafe(dap_events_socket_t * a_esocket)
HRESULT hr = MQReceiveMessage(a_esocket->mqh_recv, 1000, MQ_ACTION_RECEIVE, &l_mps, NULL, NULL, NULL, MQ_NO_TRANSACTION);
if (hr != MQ_OK) {
- log_it(L_ERROR, "An error 0x%x occured receiving a message from queue", hr);
+ log_it(L_ERROR, "An error %ld occured receiving a message from queue", hr);
return -1;
}
if (l_mpvar[1].ulVal % sizeof(void*)) {
- log_it(L_ERROR, "Queue message size incorrect: %d", l_mpvar[1].ulVal);
+ log_it(L_ERROR, "Queue message size incorrect: %lu", l_mpvar[1].ulVal);
if (l_mpvar[1].ulVal < sizeof(void*)) {
- log_it(L_ERROR, "Queue socket %d received invalid data", a_esocket->socket);
+ log_it(L_ERROR, "Queue socket %zu received invalid data", a_esocket->socket);
return -1;
}
}
@@ -903,7 +903,7 @@ int dap_events_socket_queue_proc_input_unsafe(dap_events_socket_t * a_esocket)
#ifdef DAP_OS_WINDOWS
int l_read = dap_recvfrom(a_esocket->socket, a_esocket->buf_in, a_esocket->buf_in_size_max);
if (l_read == SOCKET_ERROR) {
- log_it(L_ERROR, "Queue socket %d received invalid data, error %d", a_esocket->socket, WSAGetLastError());
+ log_it(L_ERROR, "Queue socket %zu received invalid data, error %d", a_esocket->socket, WSAGetLastError());
return -1;
}
#elif defined (DAP_EVENTS_CAPS_KQUEUE)
@@ -918,7 +918,7 @@ int dap_events_socket_queue_proc_input_unsafe(dap_events_socket_t * a_esocket)
#endif
}
}else{
- log_it(L_ERROR, "Queue socket %d accepted data but callback is NULL ", a_esocket->socket);
+ log_it(L_ERROR, "Queue socket %zu accepted data but callback is NULL ", a_esocket->socket);
return -1;
}
return 0;
@@ -1090,7 +1090,7 @@ void dap_events_socket_event_proc_input_unsafe(dap_events_socket_t *a_esocket)
#error "No Queue fetch mechanism implemented on your platform"
#endif
} else
- log_it(L_ERROR, "Event socket %d accepted data but callback is NULL ", a_esocket->socket);
+ log_it(L_ERROR, "Event socket %zu accepted data but callback is NULL ", a_esocket->socket);
}
@@ -1104,11 +1104,7 @@ typedef struct dap_events_socket_buf_item
* Waits on the socket
* return 0: timeout, 1: may send data, -1 error
*/
-#ifdef DAP_OS_WINDOWS
static int wait_send_socket(SOCKET a_sockfd, long timeout_ms)
-#else
-static int wait_send_socket(int a_sockfd, long timeout_ms)
-#endif
{
struct timeval l_tv;
fd_set l_outfd, l_errfd;
@@ -1135,7 +1131,7 @@ static int wait_send_socket(int a_sockfd, long timeout_ms)
if(l_res == -1) {
if(errno == EINTR)
continue;
- log_it(L_DEBUG, "socket %d waiting errno=%d", errno);
+ log_it(L_DEBUG, "socket %zu waiting errno=%d", a_sockfd, errno);
return l_res;
}
break;
@@ -1308,7 +1304,7 @@ int dap_events_socket_queue_ptr_send( dap_events_socket_t * a_es, void* a_arg)
HRESULT hr = MQSendMessage(a_es->mqh, &l_mps, MQ_NO_TRANSACTION);
if (hr != MQ_OK) {
- log_it(L_ERROR, "An error occured on sending message to queue, errno: 0x%x", hr);
+ log_it(L_ERROR, "An error occured on sending message to queue, errno: %ld", hr);
return hr;
}
@@ -1372,7 +1368,8 @@ int dap_events_socket_queue_ptr_send( dap_events_socket_t * a_es, void* a_arg)
return 0;
}else {
char l_errbuf[128];
- log_it(L_ERROR, "Can't send ptr to queue:\"%s\" code %d", strerror_r(l_errno, l_errbuf, sizeof (l_errbuf)), l_errno);
+ strerror_r(l_errno, l_errbuf, sizeof (l_errbuf));
+ log_it(L_ERROR, "Can't send ptr to queue:\"%s\" code %d", l_errbuf, l_errno);
return l_errno;
}
}
@@ -1533,7 +1530,7 @@ void dap_events_socket_worker_poll_update_unsafe(dap_events_socket_t * a_esocket
char l_errbuf[128];
l_errbuf[0]=0;
strerror_r(l_errno, l_errbuf, sizeof (l_errbuf));
- log_it(L_ERROR,"Can't update client socket state in the epoll_fd %d: \"%s\" (%d)",
+ log_it(L_ERROR,"Can't update client socket state in the epoll_fd %"DAP_FORMAT_HANDLE": \"%s\" (%d)",
a_esocket->worker->epoll_fd, l_errbuf, l_errno);
}
}
@@ -1850,7 +1847,7 @@ void dap_events_socket_delete_unsafe( dap_events_socket_t * a_esocket , bool a_p
void dap_events_socket_remove_from_worker_unsafe( dap_events_socket_t *a_es, dap_worker_t * a_worker)
{
if (!a_es->worker) {
- log_it(L_INFO, "No worker assigned to esocket %d", a_es->socket);
+ log_it(L_INFO, "No worker assigned to esocket %zu", a_es->socket);
return;
}
@@ -1865,7 +1862,7 @@ void dap_events_socket_remove_from_worker_unsafe( dap_events_socket_t *a_es, dap
int l_errno = errno;
char l_errbuf[128];
strerror_r(l_errno, l_errbuf, sizeof (l_errbuf));
- log_it( L_ERROR,"Can't remove event socket's handler from the epoll_fd %d \"%s\" (%d)",
+ log_it( L_ERROR,"Can't remove event socket's handler from the epoll_fd %"DAP_FORMAT_HANDLE" \"%s\" (%d)",
a_worker->epoll_fd, l_errbuf, l_errno);
} //else
// log_it( L_DEBUG,"Removed epoll's event from dap_worker #%u", a_worker->id );
@@ -2127,7 +2124,7 @@ size_t dap_events_socket_write_unsafe(dap_events_socket_t *a_es, const void * a_
{
if (a_es->buf_out_size + a_data_size > a_es->buf_out_size_max) {
if (a_es->buf_out_size_max + a_data_size > DAP_EVENTS_SOCKET_BUF_LIMIT) {
- log_it(L_ERROR, "Write esocket buffer overflow size=%u/max=%u", a_es->buf_out_size_max, DAP_EVENTS_SOCKET_BUF_LIMIT);
+ log_it(L_ERROR, "Write esocket buffer overflow size=%zu/max=%zu", a_es->buf_out_size_max, (size_t)DAP_EVENTS_SOCKET_BUF_LIMIT);
return 0;
} else {
size_t l_new_size = a_es->buf_out_size_max * 2;
diff --git a/dap-sdk/net/core/dap_proc_thread.c b/dap-sdk/net/core/dap_proc_thread.c
index 4aabf43938..073b5e40bd 100644
--- a/dap-sdk/net/core/dap_proc_thread.c
+++ b/dap-sdk/net/core/dap_proc_thread.c
@@ -385,7 +385,7 @@ static void * s_proc_thread_function(void * a_arg)
l_shed_params.sched_priority = 0;
#if defined(DAP_OS_WINDOWS)
if (!SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST))
- log_it(L_ERROR, "Couldn't set thread priority, err: %d", GetLastError());
+ log_it(L_ERROR, "Couldn't set thread priority, err: %lu", GetLastError());
#elif defined (DAP_OS_LINUX)
pthread_setschedparam(pthread_self(),SCHED_BATCH ,&l_shed_params);
#elif defined (DAP_OS_BSD)
@@ -436,7 +436,7 @@ static void * s_proc_thread_function(void * a_arg)
#ifdef DAP_OS_WINDOWS
errno = WSAGetLastError();
#endif
- log_it(L_CRITICAL, "Can't add proc queue %d on epoll ctl, error", l_thread->proc_queue->esocket->socket, errno);
+ log_it(L_CRITICAL, "Can't add proc queue %zu on epoll ctl, error %d", l_thread->proc_queue->esocket->socket, errno);
return NULL;
}
@@ -687,7 +687,7 @@ static void * s_proc_thread_function(void * a_arg)
#endif
assert(l_cur);
if(s_debug_reactor)
- log_it(L_DEBUG, "Proc thread #%u esocket %p fd=%d type=%d flags=0x%0X (%s:%s:%s:%s:%s:%s:%s:%s)", l_thread->cpu_id, l_cur, l_cur->socket,
+ log_it(L_DEBUG, "Proc thread #%u esocket %p fd=%zu type=%d flags=0x%0X (%s:%s:%s:%s:%s:%s:%s:%s)", l_thread->cpu_id, l_cur, l_cur->socket,
l_cur->type, l_cur_events, l_flag_read?"read":"", l_flag_write?"write":"", l_flag_error?"error":"",
l_flag_hup?"hup":"", l_flag_rdhup?"rdhup":"", l_flag_msg?"msg":"", l_flag_nval?"nval":"", l_flag_pri?"pri":"");
@@ -703,7 +703,7 @@ static void * s_proc_thread_function(void * a_arg)
#endif
char l_errbuf[128];
strerror_r(l_errno, l_errbuf,sizeof (l_errbuf));
- log_it(L_ERROR,"Some error on proc thread #%u with %d socket: %s(%d)",l_thread->cpu_id, l_cur->socket, l_errbuf, l_errno);
+ log_it(L_ERROR,"Some error on proc thread #%u with %zu socket: %s(%d)",l_thread->cpu_id, l_cur->socket, l_errbuf, l_errno);
if(l_cur->callbacks.error_callback)
l_cur->callbacks.error_callback(l_cur, errno);
}
@@ -757,7 +757,7 @@ static void * s_proc_thread_function(void * a_arg)
HRESULT hr = MQSendMessage(l_cur->mqh, &l_mps, MQ_NO_TRANSACTION);
if (hr != MQ_OK) {
- log_it(L_ERROR, "An error occured on sending message to queue, errno: 0x%x", hr);
+ log_it(L_ERROR, "An error occured on sending message to queue, errno: %ld", hr);
break;
} else {
if(dap_sendto(l_cur->socket, l_cur->port, NULL, 0) == SOCKET_ERROR) {
diff --git a/dap-sdk/net/core/dap_server.c b/dap-sdk/net/core/dap_server.c
index ebf72beff2..3bbb05aa92 100644
--- a/dap-sdk/net/core/dap_server.c
+++ b/dap-sdk/net/core/dap_server.c
@@ -76,7 +76,7 @@
static dap_events_socket_t * s_es_server_create(dap_events_t * a_events, int a_sock,
dap_events_socket_callbacks_t * a_callbacks, dap_server_t * a_server);
static int s_server_run(dap_server_t * a_server, dap_events_socket_callbacks_t *a_callbacks );
-static void s_es_server_accept(dap_events_socket_t *a_es, int a_remote_socket, struct sockaddr* a_remote_addr);
+static void s_es_server_accept(dap_events_socket_t *a_es, SOCKET a_remote_socket, struct sockaddr* a_remote_addr);
static void s_es_server_error(dap_events_socket_t *a_es, int a_arg);
static void s_es_server_new(dap_events_socket_t *a_es, void * a_arg);
/**
@@ -208,7 +208,7 @@ dap_server_t* dap_server_new(dap_events_t *a_events, const char * a_addr, uint16
return NULL;
}
- log_it(L_NOTICE,"Listen socket %d created...", l_server->socket_listener);
+ log_it(L_NOTICE,"Listen socket %zu created...", l_server->socket_listener);
int reuse=1;
if (setsockopt(l_server->socket_listener, SOL_SOCKET, SO_REUSEADDR, (const char*)&reuse, sizeof(reuse)) < 0)
@@ -372,7 +372,7 @@ static void s_es_server_error(dap_events_socket_t *a_es, int a_arg)
* @param a_remote_socket
* @param a_remote_addr
*/
-static void s_es_server_accept(dap_events_socket_t *a_es, int a_remote_socket, struct sockaddr *a_remote_addr)
+static void s_es_server_accept(dap_events_socket_t *a_es, SOCKET a_remote_socket, struct sockaddr *a_remote_addr)
{
socklen_t a_remote_addr_size = sizeof(*a_remote_addr);
a_es->buf_in_size = 0; // It should be 1 so we reset it to 0
@@ -382,7 +382,7 @@ static void s_es_server_accept(dap_events_socket_t *a_es, int a_remote_socket, s
dap_events_socket_t * l_es_new = NULL;
log_it(L_DEBUG, "Listening socket (binded on %s:%u) got new incomming connection",l_server->address,l_server->port);
- log_it(L_DEBUG, "Accepted new connection (sock %d from %d)", a_remote_socket, a_es->socket);
+ log_it(L_DEBUG, "Accepted new connection (sock %"DAP_FORMAT_SOCKET" from %"DAP_FORMAT_SOCKET")", a_remote_socket, a_es->socket);
l_es_new = s_es_server_create(a_es->events,a_remote_socket,&l_server->client_callbacks,l_server);
//l_es_new->is_dont_reset_write_flag = true; // By default all income connection has this flag
getnameinfo(a_remote_addr,a_remote_addr_size, l_es_new->hostaddr
diff --git a/dap-sdk/net/core/dap_timerfd.c b/dap-sdk/net/core/dap_timerfd.c
index f0f2d61501..9b6ff27f9b 100644
--- a/dap-sdk/net/core/dap_timerfd.c
+++ b/dap-sdk/net/core/dap_timerfd.c
@@ -56,7 +56,7 @@ int dap_timerfd_init()
#ifdef DAP_OS_WINDOWS
hTimerQueue = CreateTimerQueue();
if (!hTimerQueue) {
- log_it(L_CRITICAL, "Timer queue failed, err %d", GetLastError());
+ log_it(L_CRITICAL, "Timer queue failed, err %lu", GetLastError());
return -4;
}
#endif
@@ -238,7 +238,7 @@ dap_timerfd_t* dap_timerfd_create(uint64_t a_timeout_ms, dap_timerfd_callback_t
} */
if (!CreateTimerQueueTimer(&l_timerfd->th, hTimerQueue,
(WAITORTIMERCALLBACK)TimerRoutine, l_timerfd, (unsigned long)a_timeout_ms, 0, 0)) {
- log_it(L_CRITICAL, "Timer not set, error %d", GetLastError());
+ log_it(L_CRITICAL, "Timer not set, error %lu", GetLastError());
DAP_DELETE(l_timerfd);
return NULL;
}
diff --git a/dap-sdk/net/core/dap_worker.c b/dap-sdk/net/core/dap_worker.c
index d05d1847ad..a9a10b2397 100644
--- a/dap-sdk/net/core/dap_worker.c
+++ b/dap-sdk/net/core/dap_worker.c
@@ -120,14 +120,14 @@ void *dap_worker_thread(void *arg)
l_shed_params.sched_priority = 0;
#ifdef DAP_OS_WINDOWS
if (!SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL))
- log_it(L_ERROR, "Couldn'r set thread priority, err: %d", GetLastError());
+ log_it(L_ERROR, "Couldn'r set thread priority, err: %lu", GetLastError());
#else
pthread_setschedparam(pthread_self(),SCHED_FIFO ,&l_shed_params);
#endif
#ifdef DAP_EVENTS_CAPS_EPOLL
struct epoll_event l_epoll_events[ DAP_EVENTS_SOCKET_MAX]= {{0}};
- log_it(L_INFO, "Worker #%d started with epoll fd %d and assigned to dedicated CPU unit", l_worker->id, l_worker->epoll_fd);
+ log_it(L_INFO, "Worker #%d started with epoll fd %"DAP_FORMAT_HANDLE" and assigned to dedicated CPU unit", l_worker->id, l_worker->epoll_fd);
#elif defined(DAP_EVENTS_CAPS_KQUEUE)
l_worker->kqueue_fd = kqueue();
if (l_worker->kqueue_fd == -1 ){
@@ -285,7 +285,7 @@ void *dap_worker_thread(void *arg)
continue;
}
if(s_debug_reactor) {
- log_it(L_DEBUG, "--Worker #%u esocket %p uuid 0x%016llx type %d fd=%d flags=0x%0X (%s:%s:%s:%s:%s:%s:%s:%s)--",
+ log_it(L_DEBUG, "--Worker #%u esocket %p uuid 0x%016llx type %d fd=%zu flags=0x%0X (%s:%s:%s:%s:%s:%s:%s:%s)--",
l_worker->id, l_cur, l_cur->uuid, l_cur->type, l_cur->socket,
l_cur_flags, l_flag_read?"read":"", l_flag_write?"write":"", l_flag_error?"error":"",
l_flag_hup?"hup":"", l_flag_rdhup?"rdhup":"", l_flag_msg?"msg":"", l_flag_nval?"nval":"",
@@ -299,35 +299,33 @@ void *dap_worker_thread(void *arg)
switch (l_cur->type ){
case DESCRIPTOR_TYPE_SOCKET_UDP:
case DESCRIPTOR_TYPE_SOCKET_CLIENT: {
- int l_err = getsockopt(l_cur->socket, SOL_SOCKET, SO_ERROR, (void *)&l_sock_err, (socklen_t *)&l_sock_err_size);
+ getsockopt(l_cur->socket, SOL_SOCKET, SO_ERROR, (void *)&l_sock_err, (socklen_t *)&l_sock_err_size);
#ifndef DAP_OS_WINDOWS
if (l_sock_err) {
log_it(L_DEBUG, "Socket %d error %d", l_cur->socket, l_sock_err);
#else
- //if (l_err == SOCKET_ERROR) {
- log_it(L_DEBUG, "Socket %d will be shutdown (EPOLLHUP), error %d", l_cur->socket, WSAGetLastError());
+ log_it(L_DEBUG, "Socket %"DAP_FORMAT_SOCKET" will be shutdown (EPOLLHUP), error %d", l_cur->socket, WSAGetLastError());
#endif
- dap_events_socket_set_readable_unsafe(l_cur, false);
- dap_events_socket_set_writable_unsafe(l_cur, false);
- l_cur->buf_out_size = 0;
- l_cur->flags |= DAP_SOCK_SIGNAL_CLOSE;
- l_flag_error = l_flag_write = false;
- l_cur->callbacks.error_callback(l_cur, l_sock_err); // Call callback to process error event
+ dap_events_socket_set_readable_unsafe(l_cur, false);
+ dap_events_socket_set_writable_unsafe(l_cur, false);
+ l_cur->buf_out_size = 0;
+ l_cur->flags |= DAP_SOCK_SIGNAL_CLOSE;
+ l_flag_error = l_flag_write = false;
+ l_cur->callbacks.error_callback(l_cur, l_sock_err); // Call callback to process error event
#ifndef DAP_OS_WINDOWS
log_it(L_INFO, "Socket shutdown (EPOLLHUP): %s", strerror(l_sock_err));
}
#endif
- //}
break;
}
default:
if(s_debug_reactor)
- log_it(L_INFO,"RDHUP event on esocket %p (%d) type %d", l_cur, l_cur->socket, l_cur->type );
+ log_it(L_INFO,"RDHUP event on esocket %p (%"DAP_FORMAT_SOCKET") type %d", l_cur, l_cur->socket, l_cur->type );
}
}
if(l_flag_nval ){
- log_it(L_WARNING, "NVAL flag armed for socket %p (%d)", l_cur, l_cur->socket);
+ log_it(L_WARNING, "NVAL flag armed for socket %p (%"DAP_FORMAT_SOCKET")", l_cur, l_cur->socket);
l_cur->buf_out_size = 0;
l_cur->buf_in_size = 0;
l_cur->flags |= DAP_SOCK_SIGNAL_CLOSE;
@@ -376,7 +374,7 @@ void *dap_worker_thread(void *arg)
//log_it(L_DEBUG, "Comes connection with type %d", l_cur->type);
if(l_cur->buf_in_size_max && l_cur->buf_in_size >= l_cur->buf_in_size_max ) {
- log_it(L_WARNING, "Buffer is full when there is smth to read. Its dropped! esocket %p (%d)", l_cur, l_cur->socket);
+ log_it(L_WARNING, "Buffer is full when there is smth to read. Its dropped! esocket %p (%zu)", l_cur, l_cur->socket);
l_cur->buf_in_size = 0;
}
@@ -448,7 +446,7 @@ void *dap_worker_thread(void *arg)
if (l_errno == WSAEWOULDBLOCK)
continue;
else {
- log_it(L_WARNING,"Can't accept on socket %d, WSA errno: %d",l_cur->socket, l_errno);
+ log_it(L_WARNING,"Can't accept on socket %zu, WSA errno: %d",l_cur->socket, l_errno);
break;
}
#else
@@ -480,7 +478,7 @@ void *dap_worker_thread(void *arg)
if (l_cur->callbacks.timer_callback)
l_cur->callbacks.timer_callback(l_cur);
else
- log_it(L_ERROR, "Socket %d with timer callback fired, but callback is NULL ", l_cur->socket);
+ log_it(L_ERROR, "Socket %zu with timer callback fired, but callback is NULL ", l_cur->socket);
} break;
case DESCRIPTOR_TYPE_QUEUE:
@@ -513,7 +511,7 @@ void *dap_worker_thread(void *arg)
continue;
}
}else{
- log_it(L_WARNING, "We have incomming %u data but no read callback on socket %d, removing from read set",
+ log_it(L_WARNING, "We have incomming %d data but no read callback on socket %zu, removing from read set",
l_bytes_read, l_cur->socket);
dap_events_socket_set_readable_unsafe(l_cur,false);
}
@@ -521,7 +519,7 @@ void *dap_worker_thread(void *arg)
else if(l_bytes_read < 0) {
#ifdef DAP_OS_WINDOWS
if (l_cur->type != DESCRIPTOR_TYPE_SOCKET_CLIENT_SSL && l_errno != WSAEWOULDBLOCK) {
- log_it(L_ERROR, "Can't recv on socket %d, WSA error: %d", l_cur->socket, l_errno);
+ log_it(L_ERROR, "Can't recv on socket %zu, WSA error: %d", l_cur->socket, l_errno);
#else
if (l_cur->type != DESCRIPTOR_TYPE_SOCKET_CLIENT_SSL && l_errno != EAGAIN && l_errno != EWOULDBLOCK)
{ // If we have non-blocking socket
@@ -564,7 +562,7 @@ void *dap_worker_thread(void *arg)
default:{}
}
if(s_debug_reactor)
- log_it(L_INFO,"RDHUP event on esocket %p (%d) type %d", l_cur, l_cur->socket, l_cur->type );
+ log_it(L_INFO,"RDHUP event on esocket %p (%zu) type %d", l_cur, l_cur->socket, l_cur->type );
}
// If its outgoing connection
@@ -621,7 +619,7 @@ void *dap_worker_thread(void *arg)
if( ( l_flag_write&&(l_cur->flags & DAP_SOCK_READY_TO_WRITE) ) ||
( (l_cur->flags & DAP_SOCK_READY_TO_WRITE) && !(l_cur->flags & DAP_SOCK_SIGNAL_CLOSE) ) ) {
if(s_debug_reactor)
- log_it(L_DEBUG, "Main loop output: %u bytes to send", l_cur->buf_out_size);
+ log_it(L_DEBUG, "Main loop output: %zu bytes to send", l_cur->buf_out_size);
if(l_cur->callbacks.write_callback)
l_cur->callbacks.write_callback(l_cur, NULL); // Call callback to process write event
@@ -709,7 +707,7 @@ void *dap_worker_thread(void *arg)
if (hr != MQ_OK) {
l_errno = hr;
- log_it(L_ERROR, "An error occured on sending message to queue, errno: 0x%x", hr);
+ log_it(L_ERROR, "An error occured on sending message to queue, errno: %ld", hr);
break;
} else {
l_errno = WSAGetLastError();
@@ -757,14 +755,14 @@ void *dap_worker_thread(void *arg)
l_errno = errno;
break;
default:
- log_it(L_WARNING, "Socket %d is not SOCKET, PIPE or FILE but has WRITE state on. Switching it off");
+ log_it(L_WARNING, "Socket %"DAP_FORMAT_SOCKET" is not SOCKET, PIPE or FILE but has WRITE state on. Switching it off", l_cur->socket);
dap_events_socket_set_writable_unsafe(l_cur,false);
}
if(l_bytes_sent < 0) {
#ifdef DAP_OS_WINDOWS
if (l_cur->type != DESCRIPTOR_TYPE_SOCKET_CLIENT_SSL && l_errno != WSAEWOULDBLOCK) {
- log_it(L_ERROR, "Can't send to socket %d, WSA error: %d", l_cur->socket, l_errno);
+ log_it(L_ERROR, "Can't send to socket %zu, WSA error: %d", l_cur->socket, l_errno);
#else
if (l_cur->type != DESCRIPTOR_TYPE_SOCKET_CLIENT_SSL && l_errno != EAGAIN && l_errno != EWOULDBLOCK)
{ // If we have non-blocking socket
@@ -806,7 +804,7 @@ void *dap_worker_thread(void *arg)
{
if (l_cur->buf_out_size == 0) {
if(s_debug_reactor)
- log_it(L_INFO, "Process signal to close %s sock %d (ptr 0x%p uuid 0x%016llx) type %d [thread %u]",
+ log_it(L_INFO, "Process signal to close %s sock %zu (ptr 0x%p uuid 0x%016llx) type %d [thread %u]",
l_cur->remote_addr_str ? l_cur->remote_addr_str : "", l_cur->socket, l_cur, l_cur->uuid,
l_cur->type, l_tn);
@@ -843,7 +841,7 @@ void *dap_worker_thread(void *arg)
#endif
} else if (l_cur->buf_out_size ) {
if(s_debug_reactor)
- log_it(L_INFO, "Got signal to close %s sock %u [thread %u] type %d but buffer is not empty(%zd)",
+ log_it(L_INFO, "Got signal to close %s sock %zu [thread %u] type %d but buffer is not empty(%zd)",
l_cur->remote_addr_str ? l_cur->remote_addr_str : "", l_cur->socket, l_cur->type, l_tn,
l_cur->buf_out_size);
}
@@ -901,7 +899,7 @@ static void s_queue_add_es_callback( dap_events_socket_t * a_es, void * a_arg)
}
if(s_debug_reactor)
- log_it(L_NOTICE, "Received event socket %p (ident %d type %d) to add on worker", l_es_new, l_es_new->socket, l_es_new->type);
+ log_it(L_NOTICE, "Received event socket %p (ident %zu type %d) to add on worker", l_es_new, l_es_new->socket, l_es_new->type);
switch( l_es_new->type){
case DESCRIPTOR_TYPE_SOCKET_UDP: break;
@@ -982,7 +980,7 @@ static void s_queue_delete_es_callback( dap_events_socket_t * a_es, void * a_arg
//l_es->flags |= DAP_SOCK_SIGNAL_CLOSE; // Send signal to socket to kill
dap_events_socket_remove_and_delete_unsafe(l_es,false);
}else
- log_it(L_INFO, "While we were sending the delete() message, esocket %"DAP_UINT64_FORMAT_U" has been disconnected ", l_es_uuid_ptr);
+ log_it(L_INFO, "While we were sending the delete() message, esocket %"DAP_UINT64_FORMAT_U" has been disconnected ", *l_es_uuid_ptr);
DAP_DELETE(l_es_uuid_ptr);
}
@@ -1054,7 +1052,7 @@ static void s_queue_es_io_callback( dap_events_socket_t * a_es, void * a_arg)
// Check if it was removed from the list
dap_events_socket_t *l_msg_es = dap_worker_esocket_find_uuid(l_worker, l_msg->esocket_uuid);
if ( l_msg_es == NULL){
- log_it(L_INFO, "We got i/o message for esocket %"DAP_UINT64_FORMAT_U" thats now not in list. Lost %u data", l_msg->esocket_uuid, l_msg->data_size);
+ log_it(L_INFO, "We got i/o message for esocket %"DAP_UINT64_FORMAT_U" thats now not in list. Lost %zu data", l_msg->esocket_uuid, l_msg->data_size);
DAP_DELETE(l_msg);
return;
}
@@ -1105,7 +1103,8 @@ static bool s_socket_all_check_activity( void * a_arg)
if (l_es->type == DESCRIPTOR_TYPE_SOCKET_CLIENT){
if ( !(l_es->flags & DAP_SOCK_SIGNAL_CLOSE) &&
( l_curtime >= (l_es->last_time_active + s_connection_timeout) ) && !l_es->no_close ) {
- log_it( L_INFO, "Socket %u timeout (diff %u ), closing...", l_es->socket, l_curtime - (time_t)l_es->last_time_active - s_connection_timeout );
+ log_it( L_INFO, "Socket %"DAP_FORMAT_SOCKET" timeout (diff %"DAP_UINT64_FORMAT_U" ), closing...",
+ l_es->socket, l_curtime - (time_t)l_es->last_time_active - s_connection_timeout );
if (l_es->callbacks.error_callback) {
l_es->callbacks.error_callback(l_es, ETIMEDOUT);
}
@@ -1133,7 +1132,7 @@ void dap_worker_add_events_socket(dap_events_socket_t * a_events_socket, dap_wor
#else*/
if(s_debug_reactor)
- log_it(L_DEBUG,"Worker add esocket %d", a_events_socket->socket);
+ log_it(L_DEBUG,"Worker add esocket %zu", a_events_socket->socket);
int l_ret = dap_events_socket_queue_ptr_send( a_worker->queue_es_new, a_events_socket );
if(l_ret != 0 ){
char l_errbuf[128];
@@ -1168,7 +1167,7 @@ void dap_worker_add_events_socket_inter(dap_events_socket_t * a_es_input, dap_ev
int dap_worker_add_events_socket_unsafe( dap_events_socket_t * a_esocket, dap_worker_t * a_worker )
{
if(s_debug_reactor){
- log_it(L_DEBUG,"Add event socket %p (socket %d )", a_esocket, a_esocket->socket);
+ log_it(L_DEBUG,"Add event socket %p (socket %zu)", a_esocket, a_esocket->socket);
}
#ifdef DAP_EVENTS_CAPS_EPOLL
// Init events for EPOLL
diff --git a/dap-sdk/net/core/include/dap_events_socket.h b/dap-sdk/net/core/include/dap_events_socket.h
index 0bebbb2fff..af6733c2be 100644
--- a/dap-sdk/net/core/include/dap_events_socket.h
+++ b/dap-sdk/net/core/include/dap_events_socket.h
@@ -123,7 +123,7 @@ typedef void (*dap_events_socket_callback_event_t) (dap_events_socket_t *, uint6
typedef void (*dap_events_socket_callback_pipe_t) (dap_events_socket_t *,const void * , size_t); // Callback for specific client operations
typedef void (*dap_events_socket_callback_queue_ptr_t) (dap_events_socket_t *, void *); // Callback for specific client operations
typedef void (*dap_events_socket_callback_timer_t) (dap_events_socket_t * ); // Callback for specific client operations
-typedef void (*dap_events_socket_callback_accept_t) (dap_events_socket_t * , int, struct sockaddr* ); // Callback for accept of new connection
+typedef void (*dap_events_socket_callback_accept_t) (dap_events_socket_t * , SOCKET, struct sockaddr* ); // Callback for accept of new connection
typedef void (*dap_events_socket_callback_connected_t) (dap_events_socket_t * ); // Callback for connected client connection
typedef void (*dap_events_socket_worker_callback_t) (dap_events_socket_t *,dap_worker_t * ); // Callback for specific client operations
@@ -182,11 +182,7 @@ typedef uint64_t dap_events_socket_uuid_t;
typedef struct dap_events_socket {
union {
-#ifdef DAP_OS_WINDOWS
SOCKET socket;
-#else
- int socket;
-#endif
int fd;
#if defined(DAP_EVENTS_CAPS_QUEUE_MQUEUE)
mqd_t mqd;
diff --git a/dap-sdk/net/server/enc_server/dap_enc_http.c b/dap-sdk/net/server/enc_server/dap_enc_http.c
index aea5a1dbd5..9c130fe725 100644
--- a/dap-sdk/net/server/enc_server/dap_enc_http.c
+++ b/dap-sdk/net/server/enc_server/dap_enc_http.c
@@ -33,9 +33,6 @@
#include "dap_common.h"
#include <pthread.h>
-
-
-#include "dap_common.h"
#include "dap_sign.h"
#include "include/dap_http.h"
@@ -103,7 +100,7 @@ void enc_http_proc(struct dap_http_simple *cl_st, void * arg)
dap_enc_key_type_t l_enc_block_type = DAP_ENC_KEY_TYPE_IAES;
size_t l_pkey_exchange_size=MSRLN_PKA_BYTES;
size_t l_block_key_size=32;
- sscanf(cl_st->http_client->in_query_string, "enc_type=%d,pkey_exchange_type=%d,pkey_exchange_size=%"DAP_SIZET_FORMAT_Z",block_key_size=%"DAP_SIZET_FORMAT_Z,
+ dap_sscanf(cl_st->http_client->in_query_string, "enc_type=%d,pkey_exchange_type=%d,pkey_exchange_size=%zu,block_key_size=%zu",
&l_enc_block_type,&l_pkey_exchange_type,&l_pkey_exchange_size,&l_block_key_size);
log_it(L_DEBUG, "Stream encryption: %s\t public key exchange: %s",dap_enc_get_type_name(l_enc_block_type),
@@ -118,7 +115,7 @@ void enc_http_proc(struct dap_http_simple *cl_st, void * arg)
} else if (l_decode_len > l_pkey_exchange_size+ sizeof (dap_sign_hdr_t)) {
dap_sign_t *l_sign = (dap_sign_t *)&alice_msg[l_pkey_exchange_size];
if (l_sign->header.sign_size == 0 || l_sign->header.sign_size > (l_decode_len - l_pkey_exchange_size) ){
- log_it(L_WARNING,"Wrong signature size %zd (decoded length %zd)",l_sign->header.sign_size, l_decode_len);
+ log_it(L_WARNING,"Wrong signature size %u (decoded length %zu)",l_sign->header.sign_size, l_decode_len);
*return_code = Http_Status_BadRequest;
return;
}
diff --git a/dap-sdk/net/server/http_server/dap_http_simple.c b/dap-sdk/net/server/http_server/dap_http_simple.c
index 8712e0df4e..3379fc976c 100644
--- a/dap-sdk/net/server/http_server/dap_http_simple.c
+++ b/dap-sdk/net/server/http_server/dap_http_simple.c
@@ -358,11 +358,11 @@ static void s_http_client_headers_read( dap_http_client_t *a_http_client, void *
DAP_HTTP_SIMPLE(a_http_client)->request = DAP_NEW_Z_SIZE(void, DAP_HTTP_SIMPLE(a_http_client)->request_size_max);
if(!DAP_HTTP_SIMPLE(a_http_client)->request){
DAP_HTTP_SIMPLE(a_http_client)->request_size_max = 0;
- log_it(L_ERROR, "Too big content-length %u in request", a_http_client->in_content_length);
+ log_it(L_ERROR, "Too big content-length %zu in request", a_http_client->in_content_length);
}
}
else
- log_it(L_ERROR, "Not defined content-length %u in request", a_http_client->in_content_length);
+ log_it(L_ERROR, "Not defined content-length %zu in request", a_http_client->in_content_length);
} else {
log_it( L_DEBUG, "No data section, execution proc callback" );
dap_events_socket_remove_from_worker_unsafe(l_http_simple->esocket ,l_http_simple->worker);
@@ -394,7 +394,7 @@ static void s_http_client_data_write( dap_http_client_t * a_http_client, void *a
a_http_client->out_content_length - l_http_simple->reply_sent );
if ( l_http_simple->reply_sent >= a_http_client->out_content_length ) {
- log_it(L_INFO, "All the reply (%u) is sent out", a_http_client->out_content_length );
+ log_it(L_INFO, "All the reply (%zu) is sent out", a_http_client->out_content_length );
//cl_ht->client->signal_close=cl_ht->keep_alive;
a_http_client->esocket->flags |= DAP_SOCK_SIGNAL_CLOSE;
//dap_client_ready_to_write(cl_ht->client,false);
@@ -423,7 +423,7 @@ void s_http_client_data_read( dap_http_client_t *a_http_client, void * a_arg )
if( bytes_to_read ) {
// Oops! The client sent more data than write in the CONTENT_LENGTH header
if(l_http_simple->request_size + bytes_to_read > l_http_simple->request_size_max){
- log_it(L_WARNING, "Oops! Client sent more data length=%u than in content-length=%u in request", l_http_simple->request_size + bytes_to_read, a_http_client->in_content_length);
+ log_it(L_WARNING, "Oops! Client sent more data length=%zu than in content-length=%zu in request", l_http_simple->request_size + bytes_to_read, a_http_client->in_content_length);
l_http_simple->request_size_max = l_http_simple->request_size + bytes_to_read + 1;
// increase input buffer
l_http_simple->request = DAP_REALLOC(l_http_simple->request, l_http_simple->request_size_max);
diff --git a/dap-sdk/net/server/http_server/http_client/dap_http_client.c b/dap-sdk/net/server/http_server/http_client/dap_http_client.c
index 9ddf256b08..4b39d2f991 100644
--- a/dap-sdk/net/server/http_server/http_client/dap_http_client.c
+++ b/dap-sdk/net/server/http_server/http_client/dap_http_client.c
@@ -257,7 +257,7 @@ static bool s_request_line_parse( dap_http_client_t *a_http_client, char *a_buf,
memcpy( a_http_client->url_path, a_buf + l_pos_kw_begin, c_size );
a_http_client->url_path[c_size] = 0;
- log_it( L_WARNING, "Input: url '%s' pos=%lu pos_kw_begin=%lu", a_http_client->url_path, (uint32_t)l_pos, (uint32_t)l_pos_kw_begin );
+ log_it( L_WARNING, "Input: url '%s' pos=%u pos_kw_begin=%u", a_http_client->url_path, (uint32_t)l_pos, (uint32_t)l_pos_kw_begin );
l_parse_state = PS_TYPE;
l_pos_kw_begin = l_pos + 1;
break;
@@ -292,7 +292,7 @@ static bool s_request_line_parse( dap_http_client_t *a_http_client, char *a_buf,
memcpy( a_http_client->in_content_type, a_buf + l_pos_kw_begin, l_c_size );
a_http_client->in_content_type[l_c_size] = 0;
- log_it( L_WARNING, "Input: type '%s' pos=%lu pos_kw_begin=%lu", a_http_client->in_content_type, (uint32_t)l_pos, (uint32_t)l_pos_kw_begin );
+ log_it( L_WARNING, "Input: type '%s' pos=%u pos_kw_begin=%u", a_http_client->in_content_type, (uint32_t)l_pos, (uint32_t)l_pos_kw_begin );
}
return a_http_client->url_path[0] && a_http_client->action[0];
@@ -325,12 +325,13 @@ static inline void s_report_error_and_restart( dap_events_socket_t *a_esocket, d
*/
void dap_http_client_read( dap_events_socket_t *a_esocket, void *a_arg )
{
+ UNUSED(a_arg);
dap_http_client_t *l_http_client = DAP_HTTP_CLIENT( a_esocket );
// log_it( L_DEBUG, "dap_http_client_read..." );
do{
if(s_debug_http)
- log_it( L_DEBUG, "HTTP client in state read %d taked bytes in input %lu", l_http_client->state_read, a_esocket->buf_in_size );
+ log_it( L_DEBUG, "HTTP client in state read %d taked bytes in input %"DAP_UINT64_FORMAT_U, l_http_client->state_read, a_esocket->buf_in_size );
switch( l_http_client->state_read ) {
case DAP_HTTP_CLIENT_STATE_START: { // Beginning of the session. We try to detect
char l_buf_line[4096];
@@ -418,7 +419,7 @@ void dap_http_client_read( dap_events_socket_t *a_esocket, void *a_arg )
strncpy(l_http_client->reply_reason_phrase,l_http_cache->response_phrase,sizeof (l_http_client->reply_reason_phrase)-1);
if(s_debug_http)
- log_it(L_DEBUG,"%d Out: prepare cached headers", l_http_client->esocket->socket);
+ log_it(L_DEBUG,"%zu Out: prepare cached headers", l_http_client->esocket->socket);
}else if (l_http_cache){
pthread_rwlock_unlock(&l_http_client->proc->cache_rwlock);
@@ -564,7 +565,7 @@ void dap_http_client_write( dap_events_socket_t * a_esocket, void *a_arg )
case DAP_HTTP_CLIENT_STATE_HEADERS: {
dap_http_header_t *hdr = l_http_client->out_headers;
if ( hdr == NULL ) {
- log_it(L_DEBUG, "Output: headers are over (reply status code %u content_lentgh %u)",
+ log_it(L_DEBUG, "Output: headers are over (reply status code %hu content_lentgh %zu)",
l_http_client->reply_status_code, l_http_client->out_content_length);
dap_events_socket_write_f_unsafe(a_esocket, "\r\n");
dap_events_socket_set_writable_unsafe(a_esocket, true);
@@ -610,7 +611,7 @@ void dap_http_client_write( dap_events_socket_t * a_esocket, void *a_arg )
if(l_sent){
if ( l_http_client->out_cache_position + l_sent >= l_http_client->proc->cache->body_size ){ // All is sent
if(s_debug_http)
- log_it(L_DEBUG,"Out %d: All cached data over, signal to close connection", l_http_client->esocket->socket);
+ log_it(L_DEBUG,"Out %zu: All cached data over, signal to close connection", l_http_client->esocket->socket);
l_http_client->esocket->flags |= DAP_SOCK_SIGNAL_CLOSE;
l_http_client->state_write = DAP_HTTP_CLIENT_STATE_NONE;
dap_events_socket_set_writable_unsafe( a_esocket, false );
@@ -637,7 +638,7 @@ void dap_http_client_out_header_generate(dap_http_client_t *a_http_client)
if ( a_http_client->reply_status_code == 200 ) {
if (s_debug_http)
- log_it(L_DEBUG, "Out headers generate for sock %d", a_http_client->esocket->socket);
+ log_it(L_DEBUG, "Out headers generate for sock %"DAP_UINT64_FORMAT_U, a_http_client->esocket->socket);
if ( a_http_client->out_last_modified ) {
dap_time_to_str_rfc822( buf, sizeof(buf), a_http_client->out_last_modified );
dap_http_header_add( &a_http_client->out_headers, "Last-Modified", buf );
@@ -647,13 +648,13 @@ void dap_http_client_out_header_generate(dap_http_client_t *a_http_client)
log_it(L_DEBUG,"output: Content-Type = '%s'",a_http_client->out_content_type);
}
if ( a_http_client->out_content_length ) {
- dap_snprintf(buf,sizeof(buf),"%"DAP_UINT64_FORMAT_U"",a_http_client->out_content_length);
+ dap_snprintf(buf,sizeof(buf),"%zu",a_http_client->out_content_length);
dap_http_header_add(&a_http_client->out_headers,"Content-Length",buf);
- log_it(L_DEBUG,"output: Content-Length = %"DAP_UINT64_FORMAT_U"",a_http_client->out_content_length);
+ log_it(L_DEBUG,"output: Content-Length = %zu",a_http_client->out_content_length);
}
}else
if (s_debug_http)
- log_it(L_WARNING, "Out headers: nothing generate for sock %d, http code %d", a_http_client->esocket->socket,
+ log_it(L_WARNING, "Out headers: nothing generate for sock %"DAP_UINT64_FORMAT_U", http code %d", a_http_client->esocket->socket,
a_http_client->reply_status_code);
if ( a_http_client->out_connection_close || !a_http_client->keep_alive )
diff --git a/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request.h b/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request.h
index 9182f64c75..346d073351 100644
--- a/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request.h
+++ b/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request.h
@@ -23,10 +23,10 @@
*/
#pragma once
+#include "dap_json_rpc_response_handler.h"
#include "dap_common.h"
#include "dap_json_rpc_params.h"
#include "json-c/json.h"
-#include "dap_json_rpc_response_handler.h"
#include "dap_string.h"
#include "dap_client_http.h"
diff --git a/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request_handler.h b/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request_handler.h
index 64f9adc60e..e0f5c75b64 100644
--- a/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request_handler.h
+++ b/dap-sdk/net/server/json_rpc/include/dap_json_rpc_request_handler.h
@@ -24,9 +24,9 @@
#pragma once
+#include "dap_json_rpc_request.h"
#include "dap_common.h"
#include "dap_strfuncs.h"
-#include "dap_json_rpc_request.h"
#include "dap_json_rpc_params.h"
#include "dap_http_simple.h"
#include "dap_json_rpc_errors.h"
diff --git a/dap-sdk/net/server/json_rpc/src/dap_json_rpc_notification.c b/dap-sdk/net/server/json_rpc/src/dap_json_rpc_notification.c
index 8c4e973bab..25f5ae82dd 100644
--- a/dap-sdk/net/server/json_rpc/src/dap_json_rpc_notification.c
+++ b/dap-sdk/net/server/json_rpc/src/dap_json_rpc_notification.c
@@ -39,6 +39,6 @@ void dap_json_rpc_notification_handler(const char *a_name_method, dap_json_rpc_p
l_handler->func(a_params);
log_it(L_DEBUG, "Call method handling notfication: %s", a_name_method);
} else {
- log_it(L_NOTICE, "Not found method %s. This method handler notification");
+ log_it(L_NOTICE, "Not found method %s. This method handler notification", a_name_method);
}
}
diff --git a/dap-sdk/net/server/json_rpc/src/dap_json_rpc_request.c b/dap-sdk/net/server/json_rpc/src/dap_json_rpc_request.c
index c51d432413..757d52e0e1 100644
--- a/dap-sdk/net/server/json_rpc/src/dap_json_rpc_request.c
+++ b/dap-sdk/net/server/json_rpc/src/dap_json_rpc_request.c
@@ -43,13 +43,13 @@ dap_json_rpc_request_t *dap_json_rpc_request_from_json(const char *a_data)
if (json_object_object_get_ex(l_jobj, "method", &l_jobj_method)){
l_request->method = dap_strdup(json_object_get_string(l_jobj_method));
}else{
- log_it(L_ERROR, "Error parse JSON string, Can't searching method for request with id: %lu", l_request->id);
+ log_it(L_ERROR, "Error parse JSON string, Can't searching method for request with id: %"DAP_UINT64_FORMAT_U, l_request->id);
l_err_parse_request = true;
}
if (json_object_object_get_ex(l_jobj, "params", &l_jobj_params) && !l_err_parse_request){
l_request->params = dap_json_rpc_params_create_from_array_list(l_jobj_params);
}else{
- log_it(L_ERROR, "Error parse JSON string, Can't searching array params for request with id: %lu", l_request->id);
+ log_it(L_ERROR, "Error parse JSON string, Can't searching array params for request with id: %"DAP_UINT64_FORMAT_U, l_request->id);
l_err_parse_request = true;
}
} else {
diff --git a/dap-sdk/net/server/json_rpc/src/dap_json_rpc_response_handler.c b/dap-sdk/net/server/json_rpc/src/dap_json_rpc_response_handler.c
index 4419221d31..1ebfa56e69 100644
--- a/dap-sdk/net/server/json_rpc/src/dap_json_rpc_response_handler.c
+++ b/dap-sdk/net/server/json_rpc/src/dap_json_rpc_response_handler.c
@@ -14,7 +14,7 @@ int dap_json_rpc_response_registration_with_id(uint64_t a_id, dap_json_rpc_respo
l_handler->id = a_id;
l_handler->func = func;
HASH_ADD_INT(s_response_handlers, id, l_handler);
- log_it(L_NOTICE, "Registrayion handler response with id: %d", a_id);
+ log_it(L_NOTICE, "Registrayion handler response with id: %"DAP_UINT64_FORMAT_U, a_id);
return 0;
}
return 1;
@@ -32,7 +32,7 @@ void dap_json_rpc_response_unregistration(uint64_t a_id)
if (l_handler != NULL){
HASH_DEL(s_response_handlers, l_handler);
DAP_FREE(l_handler);
- log_it(L_NOTICE, "Unregistrayion handler response with id: %d", a_id);
+ log_it(L_NOTICE, "Unregistrayion handler response with id: %"DAP_UINT64_FORMAT_U, a_id);
}
}
@@ -41,11 +41,11 @@ void dap_json_rpc_response_handler(dap_json_rpc_response_t *a_response)
dap_json_rpc_response_handler_t *l_handler = NULL;
HASH_FIND_INT(s_response_handlers, (void*)a_response->id, l_handler);
if (l_handler != NULL){
- log_it(L_NOTICE, "Calling handler response id: %d", a_response->id);
+ log_it(L_NOTICE, "Calling handler response id: %"DAP_UINT64_FORMAT_U, a_response->id);
l_handler->func(a_response);
dap_json_rpc_response_unregistration(a_response->id);
} else {
- log_it(L_NOTICE, "Can't calling handler response id: %d. This handler not found", a_response->id);
+ log_it(L_NOTICE, "Can't calling handler response id: %"DAP_UINT64_FORMAT_U". This handler not found", a_response->id);
}
}
diff --git a/dap-sdk/net/server/notify_server/src/dap_notify_srv.c b/dap-sdk/net/server/notify_server/src/dap_notify_srv.c
index b0838bc0e8..4c33b21bb5 100644
--- a/dap-sdk/net/server/notify_server/src/dap_notify_srv.c
+++ b/dap-sdk/net/server/notify_server/src/dap_notify_srv.c
@@ -190,7 +190,7 @@ static void s_notify_server_callback_new(dap_events_socket_t * a_es, void * a_ar
HASH_FIND(hh,s_notify_server_clients, &a_es->uuid, sizeof (a_es->uuid), l_hh_new);
if (l_hh_new){
uint64_t *l_uuid_u64 =(uint64_t*) &a_es->uuid;
- log_it(L_WARNING,"Trying to add notify client with uuid 0x%016"DAP_UINT64_FORMAT_X"%016"DAP_UINT64_FORMAT_X" but already present this UUID in list, updating only esocket pointer if so",l_uuid_u64 );
+ log_it(L_WARNING,"Trying to add notify client with uuid 0x%016"DAP_UINT64_FORMAT_X" but already present this UUID in list, updating only esocket pointer if so", *l_uuid_u64);
l_hh_new->esocket = a_es;
l_hh_new->worker_id = a_es->worker->id;
}else {
@@ -218,7 +218,7 @@ static void s_notify_server_callback_delete(dap_events_socket_t * a_es, void * a
HASH_DELETE(hh,s_notify_server_clients, l_hh_new);
}else{
uint64_t *l_uuid_u64 =(uint64_t*) &a_es->uuid;
- log_it(L_WARNING,"Trying to remove notify client with uuid 0x%016"DAP_UINT64_FORMAT_X"%016"DAP_UINT64_FORMAT_X" but can't find such client in table",l_uuid_u64 );
+ log_it(L_WARNING,"Trying to remove notify client with uuid 0x%016"DAP_UINT64_FORMAT_X" but can't find such client in table", *l_uuid_u64);
}
pthread_rwlock_unlock(&s_notify_server_clients_mutex);
}
diff --git a/dap-sdk/net/stream/ch/dap_stream_ch_pkt.c b/dap-sdk/net/stream/ch/dap_stream_ch_pkt.c
index 76a98fe49a..a7f65c4e73 100644
--- a/dap-sdk/net/stream/ch/dap_stream_ch_pkt.c
+++ b/dap-sdk/net/stream/ch/dap_stream_ch_pkt.c
@@ -241,7 +241,7 @@ size_t dap_stream_ch_pkt_write_unsafe(dap_stream_ch_t * a_ch, uint8_t a_type, c
a_ch->stream->seq_id++;
if ( dap_stream_get_dump_packet_headers() ){
- log_it(L_INFO,"Outgoing channel packet: id='%c' size=%u type=0x%02Xu seq_id=0x%016X enc_type=0x%02hhX",
+ log_it(L_INFO,"Outgoing channel packet: id='%c' size=%u type=0x%02X seq_id=0x%016"DAP_UINT64_FORMAT_X" enc_type=0x%02hhX",
(char) l_hdr.id, l_hdr.size, l_hdr.type, l_hdr.seq_id , l_hdr.enc_type );
}
@@ -250,7 +250,7 @@ size_t dap_stream_ch_pkt_write_unsafe(dap_stream_ch_t * a_ch, uint8_t a_type, c
size_t l_buf_size_required = a_data_size + sizeof(l_hdr);
if(l_buf_size_required > sizeof(a_ch->buf) ){
- log_it(L_WARNING,"packet size is way too big: %lu bytes", a_data_size);
+ log_it(L_WARNING,"packet size is way too big: %zu bytes", a_data_size);
l_buf_allocated = DAP_NEW_Z_SIZE(uint8_t, l_buf_size_required);
l_buf_selected = l_buf_allocated;
}
diff --git a/dap-sdk/net/stream/stream/dap_stream.c b/dap-sdk/net/stream/stream/dap_stream.c
index 21ec647c43..516f0eb58f 100644
--- a/dap-sdk/net/stream/stream/dap_stream.c
+++ b/dap-sdk/net/stream/stream/dap_stream.c
@@ -483,7 +483,7 @@ static void s_esocket_data_read(dap_events_socket_t* a_client, void * a_arg)
int * l_ret = (int *) a_arg;
if (s_dump_packet_headers ) {
- log_it(L_DEBUG,"dap_stream_data_read: ready_to_write=%s, client->buf_in_size=%u" ,
+ log_it(L_DEBUG,"dap_stream_data_read: ready_to_write=%s, client->buf_in_size=%zu" ,
(a_client->flags & DAP_SOCK_READY_TO_WRITE)?"true":"false", a_client->buf_in_size );
}
*l_ret = dap_stream_data_proc_read( l_stream);
@@ -511,7 +511,7 @@ static void s_esocket_write(dap_events_socket_t* a_esocket , void * a_arg){
}
}
if (s_dump_packet_headers ) {
- log_it(L_DEBUG,"dap_stream_data_write: ready_to_write=%s client->buf_out_size=%u" ,
+ log_it(L_DEBUG,"dap_stream_data_write: ready_to_write=%s client->buf_out_size=%zu" ,
l_ready_to_write?"true":"false", a_esocket->buf_out_size );
}
dap_events_socket_set_writable_unsafe(a_esocket, l_ready_to_write);
@@ -759,12 +759,12 @@ static void s_stream_proc_pkt_in(dap_stream_t * a_stream)
size_t l_dec_pkt_size = dap_stream_pkt_read_unsafe(a_stream, l_pkt, l_ch_pkt, sizeof(a_stream->pkt_cache));
if (l_dec_pkt_size == 0) {
- log_it(L_WARNING, "Input: can't decode packet size=%d",l_pkt_size);
+ log_it(L_WARNING, "Input: can't decode packet size=%zu",l_pkt_size);
DAP_DELETE(l_pkt);
return;
}
if (l_dec_pkt_size != l_ch_pkt->hdr.size + sizeof(l_ch_pkt->hdr)) {
- log_it(L_WARNING, "Input: decoded packet has bad size = %d, decoded size = %d", l_ch_pkt->hdr.size, l_dec_pkt_size);
+ log_it(L_WARNING, "Input: decoded packet has bad size = %u, decoded size = %zu", l_ch_pkt->hdr.size, l_dec_pkt_size);
DAP_DELETE(l_pkt);
return;
}
@@ -785,7 +785,7 @@ static void s_stream_proc_pkt_in(dap_stream_t * a_stream)
l_ch->stat.bytes_read+=l_ch_pkt->hdr.size;
if(l_ch->proc && l_ch->proc->packet_in_callback){
if ( s_dump_packet_headers ){
- log_it(L_INFO,"Income channel packet: id='%c' size=%u type=0x%02Xu seq_id=0x%016X enc_type=0x%02X",(char) l_ch_pkt->hdr.id,
+ log_it(L_INFO,"Income channel packet: id='%c' size=%u type=0x%02X seq_id=0x%016"DAP_UINT64_FORMAT_X" enc_type=0x%02X",(char) l_ch_pkt->hdr.id,
l_ch_pkt->hdr.size, l_ch_pkt->hdr.type, l_ch_pkt->hdr.seq_id , l_ch_pkt->hdr.enc_type);
}
l_ch->proc->packet_in_callback(l_ch,l_ch_pkt);
@@ -831,12 +831,12 @@ static bool s_detect_loose_packet(dap_stream_t * a_stream)
if(l_count_loosed_packets > 0)
{
log_it(L_WARNING, "Detected loosed %d packets. "
- "Last read seq_id packet: %d Current: %d", l_count_loosed_packets,
+ "Last read seq_id packet: %zu Current: %"DAP_UINT64_FORMAT_U, l_count_loosed_packets,
a_stream->client_last_seq_id_packet, l_ch_pkt->hdr.seq_id);
} else if(l_count_loosed_packets < 0) {
if(a_stream->client_last_seq_id_packet != 0 && l_ch_pkt->hdr.seq_id != 0) {
log_it(L_WARNING, "Something wrong. count_loosed packets %d can't less than zero. "
- "Last read seq_id packet: %d Current: %d", l_count_loosed_packets,
+ "Last read seq_id packet: %zu Current: %"DAP_UINT64_FORMAT_U, l_count_loosed_packets,
a_stream->client_last_seq_id_packet, l_ch_pkt->hdr.seq_id);
} // else client don't support seqid functionality
}
@@ -859,8 +859,8 @@ static bool s_callback_keepalive( void * a_arg)
dap_events_socket_t * l_es = dap_worker_esocket_find_uuid(l_worker, *l_es_uuid);
if( l_es){
if(s_debug)
- log_it(L_DEBUG,"Keepalive for sock fd %d uuid 0x%016llu", l_es->socket, *l_es_uuid);
- dap_stream_pkt_hdr_t l_pkt = {0};
+ log_it(L_DEBUG,"Keepalive for sock fd %zu uuid 0x%016"DAP_UINT64_FORMAT_U, l_es->socket, *l_es_uuid);
+ dap_stream_pkt_hdr_t l_pkt = {};
l_pkt.type = STREAM_PKT_TYPE_KEEPALIVE;
memcpy(l_pkt.sig, c_dap_stream_sig, sizeof(l_pkt.sig));
dap_events_socket_write_unsafe( l_es, &l_pkt, sizeof(l_pkt));
diff --git a/dap-sdk/net/stream/stream/dap_stream_pkt.c b/dap-sdk/net/stream/stream/dap_stream_pkt.c
index 39e56a109d..d0b5efa8aa 100644
--- a/dap-sdk/net/stream/stream/dap_stream_pkt.c
+++ b/dap-sdk/net/stream/stream/dap_stream_pkt.c
@@ -76,7 +76,7 @@ dap_stream_pkt_t * dap_stream_pkt_detect(void * a_data, size_t data_size)
if(memcmp(sig_start,c_dap_stream_sig,sizeof(c_dap_stream_sig))==0){
ret = (dap_stream_pkt_t *)sig_start;
if (length_left < sizeof(dap_stream_ch_pkt_hdr_t)) {
- log_it(L_ERROR, "Too small packet size %u", length_left);
+ log_it(L_ERROR, "Too small packet size %zu", length_left);
ret = NULL;
break;
}
diff --git a/dap-sdk/net/stream/stream/dap_stream_worker.c b/dap-sdk/net/stream/stream/dap_stream_worker.c
index ca8ab22b36..8e553a3da9 100644
--- a/dap-sdk/net/stream/stream/dap_stream_worker.c
+++ b/dap-sdk/net/stream/stream/dap_stream_worker.c
@@ -106,7 +106,7 @@ static void s_ch_io_callback(dap_events_socket_t * a_es, void * a_msg)
HASH_FIND(hh_worker, l_stream_worker->channels , &l_msg->ch_uuid , sizeof (l_msg->ch_uuid ), l_msg_ch );
pthread_rwlock_unlock(&l_stream_worker->channels_rwlock);
if ( l_msg_ch == NULL){
- log_it(L_DEBUG, "We got i/o message for client thats now not in list. Lost %u data", l_msg->data_size);
+ log_it(L_DEBUG, "We got i/o message for client thats now not in list. Lost %zu data", l_msg->data_size);
DAP_DELETE(l_msg);
return;
}
diff --git a/modules/app-cli/dap_app_cli.c b/modules/app-cli/dap_app_cli.c
index 6c43a07e6f..495150e71c 100644
--- a/modules/app-cli/dap_app_cli.c
+++ b/modules/app-cli/dap_app_cli.c
@@ -27,11 +27,11 @@
#include <stdlib.h>
#include <string.h>
+#include "dap_chain_node_cli.h"
//#include "dap_client.h"
#include "dap_common.h"
#include "dap_file_utils.h"
#include "dap_strfuncs.h"
-#include "dap_chain_node_cli.h"
#include "dap_app_cli.h"
#include "dap_app_cli_net.h"
#include "dap_app_cli_shell.h"
diff --git a/modules/app-cli/dap_app_cli_shell.c b/modules/app-cli/dap_app_cli_shell.c
index 56b9e51cbb..c1cf0201e0 100644
--- a/modules/app-cli/dap_app_cli_shell.c
+++ b/modules/app-cli/dap_app_cli_shell.c
@@ -21,6 +21,7 @@
#include <ws2tcpip.h>
#include <io.h>
#include <pthread.h>
+#include <conio.h>
#else
#include <sys/ttydefaults.h>
#endif
@@ -152,7 +153,7 @@ char *rl_readline(const char *prompt)
{
unsigned char c = rl_getc(rl_instream);
- if(c == EOF || c == NEWLINE)
+ if((char)c == EOF || c == NEWLINE)
break;
value[value_len] = c;
value_len++;
diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c
index c0d8c61a17..5893302cc5 100644
--- a/modules/chain/dap_chain.c
+++ b/modules/chain/dap_chain.c
@@ -300,9 +300,9 @@ dap_chain_t * dap_chain_load_from_cfg(dap_ledger_t* a_ledger, const char * a_cha
// Recognize chains id
if ( (l_chain_id_str = dap_config_get_item_str(l_cfg,"chain","id")) != NULL ){
- if ( sscanf(l_chain_id_str,"0x%"DAP_UINT64_FORMAT_X,& l_chain_id_u ) !=1 ){
- if ( sscanf(l_chain_id_str,"0x%"DAP_UINT64_FORMAT_x,&l_chain_id_u) !=1 ) {
- if ( sscanf(l_chain_id_str,"%"DAP_UINT64_FORMAT_U,&l_chain_id_u ) !=1 ){
+ if ( dap_sscanf(l_chain_id_str,"0x%"DAP_UINT64_FORMAT_X,& l_chain_id_u ) !=1 ){
+ if ( dap_sscanf(l_chain_id_str,"0x%"DAP_UINT64_FORMAT_x,&l_chain_id_u) !=1 ) {
+ if ( dap_sscanf(l_chain_id_str,"%"DAP_UINT64_FORMAT_U,&l_chain_id_u ) !=1 ){
log_it (L_ERROR,"Can't recognize '%s' string as chain net id, hex or dec",l_chain_id_str);
dap_config_close(l_cfg);
return NULL;
@@ -323,7 +323,7 @@ dap_chain_t * dap_chain_load_from_cfg(dap_ledger_t* a_ledger, const char * a_cha
}
// Read chain name
if ( ( l_chain_name = dap_config_get_item_str(l_cfg,"chain","name") ) == NULL ){
- log_it (L_ERROR,"Can't read chain net name ",l_chain_id_str);
+ log_it (L_ERROR,"Can't read chain net name %s",l_chain_id_str);
dap_config_close(l_cfg);
return NULL;
}
@@ -364,7 +364,7 @@ dap_chain_t * dap_chain_load_from_cfg(dap_ledger_t* a_ledger, const char * a_cha
char** l_datum_types = NULL;
uint16_t l_datum_types_count = 0;
if((l_datum_types = dap_config_get_array_str(l_cfg, "chain", "datum_types", &l_datum_types_count)) == NULL) {
- log_it(L_WARNING, "Can't read chain datum types ", l_chain_id_str);
+ log_it(L_WARNING, "Can't read chain datum types for chain %s", l_chain_id_str);
//dap_config_close(l_cfg);
//return NULL;
}
@@ -382,7 +382,7 @@ dap_chain_t * dap_chain_load_from_cfg(dap_ledger_t* a_ledger, const char * a_cha
l_chain->datum_types_count = l_count_recognized;
}
if((l_datum_types = dap_config_get_array_str(l_cfg, "chain", "mempool_auto_types", &l_datum_types_count)) == NULL) {
- log_it(L_WARNING, "Can't read chain mempool auto types ", l_chain_id_str);
+ log_it(L_WARNING, "Can't read chain mempool auto types for chain %s", l_chain_id_str);
}
// add datum types
if(l_chain && l_datum_types && l_datum_types_count) {
diff --git a/modules/chain/dap_chain_cell.c b/modules/chain/dap_chain_cell.c
index 74cc658e77..914943b653 100644
--- a/modules/chain/dap_chain_cell.c
+++ b/modules/chain/dap_chain_cell.c
@@ -99,7 +99,7 @@ dap_chain_cell_t * dap_chain_cell_create_fill2(dap_chain_t * a_chain, const char
{
dap_chain_cell_t * l_cell = DAP_NEW_Z(dap_chain_cell_t);
l_cell->chain = a_chain;
- sscanf(a_filename, "%"DAP_UINT64_FORMAT_x".dchaincell", &l_cell->id.uint64);
+ dap_sscanf(a_filename, "%"DAP_UINT64_FORMAT_x".dchaincell", &l_cell->id.uint64);
l_cell->file_storage_path = dap_strdup_printf(a_filename);
pthread_rwlock_init(&l_cell->storage_rwlock, NULL);
pthread_rwlock_wrlock(&a_chain->cell_rwlock);
@@ -195,16 +195,16 @@ int dap_chain_cell_load(dap_chain_t * a_chain, const char * a_cell_file_path)
}
++q;
} else {
- log_it(L_ERROR, "Read only %zd of %zd bytes, stop cell loading", l_read, l_el_size);
+ log_it(L_ERROR, "Read only %lu of %zu bytes, stop cell loading", l_read, l_el_size);
DAP_DELETE(l_element);
ret = -6;
break;
}
}
if (ret < 0) {
- log_it(L_INFO, "Couldn't load all atoms, %d only", q);
+ log_it(L_INFO, "Couldn't load all atoms, %lu only", q);
} else {
- log_it(L_INFO, "Loaded all %d atoms in cell %s", q, a_cell_file_path);
+ log_it(L_INFO, "Loaded all %lu atoms in cell %s", q, a_cell_file_path);
}
if (q)
dap_chain_cell_create_fill2(a_chain, a_cell_file_path);
@@ -225,7 +225,7 @@ int dap_chain_cell_file_append( dap_chain_cell_t * a_cell, const void* a_atom, s
if(!a_cell)
return -1;
if (!a_atom && !a_cell->chain) {
- log_it(L_WARNING,"Chain not found for cell 0x%016X ( %s )",
+ log_it(L_WARNING,"Chain not found for cell 0x%016"DAP_UINT64_FORMAT_X" ( %s )",
a_cell->id.uint64, a_cell->file_storage_path);
return -1;
}
@@ -239,7 +239,7 @@ int dap_chain_cell_file_append( dap_chain_cell_t * a_cell, const void* a_atom, s
a_cell->file_storage = fopen(l_file_path, "w+b");
}
if (!a_cell->file_storage) {
- log_it(L_ERROR, "Chain cell \"%s\" cannot be opened 0x%016X",
+ log_it(L_ERROR, "Chain cell \"%s\" cannot be opened 0x%016"DAP_UINT64_FORMAT_X,
a_cell->file_storage_path,
a_cell->id.uint64);
return -3;
@@ -257,10 +257,10 @@ int dap_chain_cell_file_append( dap_chain_cell_t * a_cell, const void* a_atom, s
.chain_net_id = a_cell->chain->net_id
};
if(fwrite(&l_hdr, 1, sizeof(l_hdr), a_cell->file_storage) == sizeof(l_hdr)) {
- log_it(L_NOTICE, "Initialized file storage for cell 0x%016X ( %s )",
+ log_it(L_NOTICE, "Initialized file storage for cell 0x%016"DAP_UINT64_FORMAT_X" ( %s )",
a_cell->id.uint64, a_cell->file_storage_path);
} else {
- log_it(L_ERROR, "Can't init file storage for cell 0x%016X ( %s )",
+ log_it(L_ERROR, "Can't init file storage for cell 0x%016"DAP_UINT64_FORMAT_X" ( %s )",
a_cell->id.uint64, a_cell->file_storage_path);
dap_chain_cell_close(a_cell);
return -4;
@@ -278,7 +278,7 @@ int dap_chain_cell_file_append( dap_chain_cell_t * a_cell, const void* a_atom, s
l_atom = a_atom ? NULL : a_cell->chain->callback_atom_iter_get_next(l_atom_iter, &l_atom_size), l_count++)
{
if (fwrite(&l_atom_size, 1, sizeof(l_atom_size), a_cell->file_storage) != sizeof(l_atom_size)) {
- log_it (L_ERROR,"Can't write atom data size from cell 0x%016X in \"%s\"",
+ log_it (L_ERROR,"Can't write atom data size from cell 0x%016"DAP_UINT64_FORMAT_X" in \"%s\"",
a_cell->id.uint64,
a_cell->file_storage_path);
dap_chain_cell_close(a_cell);
@@ -287,7 +287,7 @@ int dap_chain_cell_file_append( dap_chain_cell_t * a_cell, const void* a_atom, s
}
l_total_wrote_bytes += sizeof(l_atom_size);
if (fwrite(l_atom, 1, l_atom_size, a_cell->file_storage) != l_atom_size) {
- log_it (L_ERROR, "Can't write data from cell 0x%016X to the file \"%s\"",
+ log_it (L_ERROR, "Can't write data from cell 0x%016"DAP_UINT64_FORMAT_X" to the file \"%s\"",
a_cell->id.uint64,
a_cell->file_storage_path);
dap_chain_cell_close(a_cell);
@@ -306,7 +306,7 @@ int dap_chain_cell_file_append( dap_chain_cell_t * a_cell, const void* a_atom, s
fflush(a_cell->file_storage);
if (!a_atom) {
ftruncate(fileno(a_cell->file_storage), l_total_wrote_bytes + sizeof(dap_chain_cell_file_header_t));
- log_it(L_DEBUG, "Saved %d atoms (total %"DAP_UINT64_FORMAT_U" bytes", l_count, l_total_wrote_bytes);
+ log_it(L_DEBUG, "Saved %zu atoms (total %zu bytes", l_count, l_total_wrote_bytes);
}
} else if (!a_atom) {
log_it(L_WARNING, "Nothing to save, event table is empty");
diff --git a/modules/chain/dap_chain_ledger.c b/modules/chain/dap_chain_ledger.c
index 9f3b12182d..5c79d204fd 100644
--- a/modules/chain/dap_chain_ledger.c
+++ b/modules/chain/dap_chain_ledger.c
@@ -374,7 +374,7 @@ int dap_chain_ledger_token_add(dap_ledger_t * a_ledger, dap_chain_datum_token_t
dap_sign_get_pkey_hash(l_token_item->auth_signs[k],&l_token_item->auth_signs_pkey_hash[k]);
}
if(s_debug_more)
- log_it(L_NOTICE, "Simple token %s added (total_supply = %.1llf total_signs_valid=%hu signs_total=%hu type=DAP_CHAIN_DATUM_TOKEN_PRIVATE )",
+ log_it(L_NOTICE, "Simple token %s added (total_supply = %.1Lf total_signs_valid=%hu signs_total=%hu type=DAP_CHAIN_DATUM_TOKEN_PRIVATE )",
a_token->ticker, dap_chain_datoshi_to_coins(a_token->header_private.total_supply),
a_token->header_private.signs_valid, a_token->header_private.signs_total);
}
@@ -532,7 +532,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_ALLOWED_ADD expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_ALLOWED_ADD expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
return -10;
}
@@ -562,7 +562,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_ALLOWED_REMOVE expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_ALLOWED_REMOVE expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
return -10;
}
@@ -575,7 +575,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
a_token_item->tx_recv_allow_size = 0;
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_ALLOWED_CLEAR expected to have 0 bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_ALLOWED_CLEAR expected to have 0 bytes data length, not %u",
l_tsd->size );
return -10;
}
@@ -622,7 +622,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_BLOCKED_ADD expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_BLOCKED_ADD expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
return -10;
}
@@ -652,7 +652,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_BLOCKED_REMOVE expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_BLOCKED_REMOVE expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
return -10;
}
@@ -665,7 +665,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
a_token_item->tx_recv_block_size = 0;
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_BLOCKED_CLEAR expected to have 0 bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_RECEIVER_BLOCKED_CLEAR expected to have 0 bytes data length, not %u",
l_tsd->size );
return -10;
}
@@ -709,7 +709,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_ALLOWED_ADD expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_ALLOWED_ADD expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
}
}break;
@@ -738,7 +738,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_ALLOWED_REMOVE expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_ALLOWED_REMOVE expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
return -10;
}
@@ -751,7 +751,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
a_token_item->tx_send_allow_size = 0;
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_ALLOWED_CLEAR expected to have 0 bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_ALLOWED_CLEAR expected to have 0 bytes data length, not %u",
l_tsd->size );
return -10;
}
@@ -796,7 +796,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_BLOCKED_ADD expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_BLOCKED_ADD expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
}
}break;
@@ -825,7 +825,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
}
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_BLOCKED_REMOVE expected to have %zd bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_BLOCKED_REMOVE expected to have %zu bytes data length, not %u",
sizeof (dap_chain_addr_t), l_tsd->size );
return -10;
}
@@ -838,7 +838,7 @@ static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_chain_ledger_token_ite
a_token_item->tx_send_block_size = 0;
}else{
if(s_debug_more)
- log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_BLOCKED_CLEAR expected to have 0 bytes data length, not %zd",
+ log_it(L_ERROR,"TSD param DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TX_SENDER_BLOCKED_CLEAR expected to have 0 bytes data length, not %u",
l_tsd->size );
return -10;
}
@@ -1090,7 +1090,7 @@ int dap_chain_ledger_token_emission_add_check(dap_ledger_t *a_ledger, const dap_
ret = -1;
}else if ( (! l_token_item) && ( l_threshold_emissions_count >= s_treshold_emissions_max)) {
if(s_debug_more)
- log_it(L_WARNING,"Treshold for emissions is overfulled (%lu max)",
+ log_it(L_WARNING,"Treshold for emissions is overfulled (%zu max)",
s_treshold_emissions_max);
ret = -2;
}else{ // Chech emission correctness
@@ -1213,7 +1213,7 @@ int dap_chain_ledger_token_emission_add(dap_ledger_t *a_ledger,
DAP_DELETE(l_gdb_group);
char * l_token_emission_address_str = dap_chain_addr_to_str( &(a_token_emission->hdr.address) );
if(s_debug_more)
- log_it(L_NOTICE, "Added token emission datum to %s: type=%s value=%.1llf token=%s to_addr=%s ",
+ log_it(L_NOTICE, "Added token emission datum to %s: type=%s value=%.1Lf token=%s to_addr=%s ",
l_token_item?"emissions cache":"emissions treshold",
c_dap_chain_datum_token_emission_type_str[ a_token_emission->hdr.type ] ,
dap_chain_datoshi_to_coins(a_token_emission->hdr.value), c_token_ticker,
@@ -1221,7 +1221,7 @@ int dap_chain_ledger_token_emission_add(dap_ledger_t *a_ledger,
DAP_DELETE(l_token_emission_address_str);
}else{
if(s_debug_more)
- log_it(L_WARNING,"Treshold for emissions is overfulled (%lu max), dropping down new data, added nothing",
+ log_it(L_WARNING,"Treshold for emissions is overfulled (%zu max), dropping down new data, added nothing",
s_treshold_emissions_max);
ret = -2;
}
@@ -2072,7 +2072,7 @@ int dap_chain_ledger_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx,
if (!l_item_tmp) {
if (l_threshold_txs_count >= s_treshold_txs_max) {
if(s_debug_more)
- log_it(L_WARNING,"Treshold for tranactions is overfulled (%lu max), dropping down new data, added nothing",
+ log_it(L_WARNING,"Treshold for tranactions is overfulled (%zu max), dropping down new data, added nothing",
s_treshold_txs_max);
} else {
l_item_tmp = DAP_NEW_Z(dap_chain_ledger_tx_item_t);
@@ -2148,7 +2148,7 @@ int dap_chain_ledger_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx,
bound_item->out.tx_prev_out->header.value :
bound_item->out.tx_prev_out_ext->header.value;
if(s_debug_more)
- log_it(L_DEBUG,"SPEND %lu from addr: %s", l_value, l_wallet_balance_key);
+ log_it(L_DEBUG,"SPEND %"DAP_UINT64_FORMAT_U" from addr: %s", l_value, l_wallet_balance_key);
uint128_t l_sub = dap_chain_uint128_from(l_value);
wallet_balance->balance = dap_uint128_substract(wallet_balance->balance, l_sub);
// Update the cache
@@ -2181,7 +2181,7 @@ int dap_chain_ledger_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx,
if(res == -2) {
if(s_debug_more) {
char * l_tx_prev_hash_str = dap_chain_hash_fast_to_str_new(&l_tx_prev_hash_to_del);
- log_it(L_ERROR, "Can't delete previous transactions because hash=0x%x not found", l_tx_prev_hash_str);
+ log_it(L_ERROR, "Can't delete previous transactions because hash=%s not found", l_tx_prev_hash_str);
DAP_DELETE(l_tx_prev_hash_str);
}
ret = -100;
@@ -2191,7 +2191,7 @@ int dap_chain_ledger_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx,
else if(res != 1) {
if(s_debug_more) {
char * l_tx_prev_hash_str = dap_chain_hash_fast_to_str_new(&l_tx_prev_hash_to_del);
- log_it(L_ERROR, "Can't delete previous transactions with hash=0x%x", l_tx_prev_hash_str);
+ log_it(L_ERROR, "Can't delete previous transactions with hash=%s", l_tx_prev_hash_str);
DAP_DELETE(l_tx_prev_hash_str);
}
ret = -101;
@@ -2246,7 +2246,7 @@ int dap_chain_ledger_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx,
uint64_t l_value = (l_type == TX_ITEM_TYPE_OUT) ? l_out_item->header.value : l_out_item_ext->header.value;
if(s_debug_more)
- log_it (L_DEBUG,"GOT %lu to addr: %s", l_value, l_wallet_balance_key);
+ log_it (L_DEBUG,"GOT %"DAP_UINT64_FORMAT_U" to addr: %s", l_value, l_wallet_balance_key);
pthread_rwlock_rdlock(&l_ledger_priv->balance_accounts_rwlock);
HASH_FIND_STR(PVT(a_ledger)->balance_accounts, l_wallet_balance_key, wallet_balance);
pthread_rwlock_unlock(&l_ledger_priv->balance_accounts_rwlock);
@@ -2566,7 +2566,8 @@ uint128_t dap_chain_ledger_calc_balance(dap_ledger_t *a_ledger, const dap_chain_
pthread_rwlock_unlock(&PVT(a_ledger)->balance_accounts_rwlock);
if (l_balance_item) {
if(s_debug_more)
- log_it (L_INFO,"Found address in cache with balance %"DAP_UINT64_FORMAT_U"", l_balance_item->balance);
+ log_it (L_INFO,"Found address in cache with balance %"DAP_UINT64_FORMAT_U"",
+ dap_chain_uint128_to(l_balance_item->balance));
l_ret = l_balance_item->balance;
} else {
if (s_debug_more)
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 807f755d14..1baf6eb0b3 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
@@ -205,8 +205,8 @@ static bool s_grace_period_control(dap_chain_net_srv_grace_t *a_grace)
// Check cond output if it equesl or not to request
if ( l_tx_out_cond->subtype.srv_pay.srv_uid.uint64 != l_request->hdr.srv_uid.uint64 ){
- log_it( L_WARNING, "Wrong service uid in request, tx expect to close its output with 0x%016lX",
- l_tx_out_cond->subtype.srv_pay.srv_uid );
+ log_it( L_WARNING, "Wrong service uid in request, tx expect to close its output with 0x%016"DAP_UINT64_FORMAT_X,
+ l_tx_out_cond->subtype.srv_pay.srv_uid.uint64 );
l_err.code = DAP_STREAM_CH_CHAIN_NET_SRV_PKT_TYPE_RESPONSE_ERROR_CODE_TX_COND_WRONG_SRV_UID ;
goto free_exit;
}
@@ -472,7 +472,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch , void* a_arg)
// only for server
case DAP_STREAM_CH_CHAIN_NET_SRV_PKT_TYPE_SIGN_RESPONSE:{
if (l_ch_pkt->hdr.size <= sizeof(dap_chain_receipt_info_t) + 1) {
- log_it(L_ERROR, "Wrong sign response size, %zd when expected at least %zd with smth", l_ch_pkt->hdr.size,
+ log_it(L_ERROR, "Wrong sign response size, %u when expected at least %zu with smth", l_ch_pkt->hdr.size,
sizeof(dap_chain_receipt_info_t)+1 );
break;
}
@@ -704,7 +704,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch , void* a_arg)
log_it( L_NOTICE, "Remote responsed with error code 0x%08X", l_err->code );
// TODO code for service client mode
}else{
- log_it(L_ERROR, "Wrong error response size, %zd when expected %zd", l_ch_pkt->hdr.size,
+ log_it(L_ERROR, "Wrong error response size, %u when expected %zu", l_ch_pkt->hdr.size,
sizeof ( dap_stream_ch_chain_net_srv_pkt_error_t) );
}
} break;
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 5c9bfdbcfe..2a6e503364 100644
--- a/modules/channel/chain-net/dap_stream_ch_chain_net.c
+++ b/modules/channel/chain-net/dap_stream_ch_chain_net.c
@@ -246,10 +246,9 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
dap_chain_node_addr_t * l_addr = (dap_chain_node_addr_t *) l_ch_chain_net_pkt->data;
if(l_session_data)
memcpy( &l_session_data->addr_remote,l_addr,sizeof (*l_addr) );
- log_it(L_NOTICE,"Accepted remote node addr 0x%016llX",l_addr->uint64);
+ log_it(L_NOTICE,"Accepted remote node addr 0x%016"DAP_UINT64_FORMAT_X, l_addr->uint64);
}else {
- log_it(L_WARNING,"Wrong data secion size %u",l_ch_chain_net_pkt_data_size,
- sizeof (dap_chain_node_addr_t));
+ log_it(L_WARNING,"Wrong data secion size %zu",l_ch_chain_net_pkt_data_size);
}
dap_stream_ch_set_ready_to_write_unsafe(a_ch, false);
}break;
@@ -274,8 +273,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if(l_session_data)
memcpy( &l_session_data->addr_remote,l_addr,sizeof (*l_addr) );
}else {
- log_it(L_WARNING,"Wrong data secion size %u",l_ch_chain_net_pkt_data_size,
- sizeof (dap_chain_node_addr_t));
+ log_it(L_WARNING,"Wrong data secion size %zu",l_ch_chain_net_pkt_data_size);
}
dap_stream_ch_set_ready_to_write_unsafe(a_ch, false);
}break;
diff --git a/modules/channel/chain/dap_stream_ch_chain.c b/modules/channel/chain/dap_stream_ch_chain.c
index 749d9e7969..02b7d39530 100644
--- a/modules/channel/chain/dap_stream_ch_chain.c
+++ b/modules/channel/chain/dap_stream_ch_chain.c
@@ -510,17 +510,19 @@ static bool s_sync_in_chains_callback(dap_proc_thread_t *a_thread, void *a_arg)
}
dap_chain_cell_t *l_cell = dap_chain_cell_find_by_id(l_chain, l_sync_request->request_hdr.cell_id);
if (!l_cell) {
- log_it(L_INFO, "Creating cell 0x%016X", l_sync_request->request_hdr.cell_id.uint64);
+ log_it(L_INFO, "Creating cell 0x%016"DAP_UINT64_FORMAT_X, l_sync_request->request_hdr.cell_id.uint64);
l_cell = dap_chain_cell_create_fill(l_chain, l_sync_request->request_hdr.cell_id);
}
if (!l_cell) {
- log_it(L_ERROR, "Can't create cell with id 0x%x to save event...", l_sync_request->request_hdr.cell_id);
+ log_it(L_ERROR, "Can't create cell with id 0x%"DAP_UINT64_FORMAT_x" to save event...", l_sync_request->request_hdr.cell_id.uint64);
break;
}
if (l_atom_add_res == ATOM_ACCEPT) {
int l_res = dap_chain_cell_file_append(l_cell, l_atom_copy, l_atom_copy_size);
if(l_res < 0) {
- log_it(L_ERROR, "Can't save event 0x%x to the file '%s'", l_atom_hash,
+ char l_atom_hash_str[72]={'\0'};
+ dap_chain_hash_fast_to_str(&l_atom_hash,l_atom_hash_str,sizeof (l_atom_hash_str)-1 );
+ log_it(L_ERROR, "Can't save event %s to the file '%s'", l_atom_hash_str,
l_cell ? l_cell->file_storage_path : "[null]");
} else {
dap_db_set_last_hash_remote(l_sync_request->request.node_addr.uint64, l_chain, &l_atom_hash);
@@ -537,8 +539,10 @@ static bool s_sync_in_chains_callback(dap_proc_thread_t *a_thread, void *a_arg)
int l_res = dap_chain_cell_file_append(l_cell, l_atom_treshold, l_atom_treshold_size);
log_it(L_INFO, "Added atom from treshold");
if(l_res < 0) {
- log_it(L_ERROR, "Can't save event 0x%x from treshold to file '%s'",
- l_atom_treshold, l_cell ? l_cell->file_storage_path : "[null]");
+ char l_atom_hash_str[72]={'\0'};
+ dap_chain_hash_fast_to_str(&l_atom_hash,l_atom_hash_str,sizeof (l_atom_hash_str)-1 );
+ log_it(L_ERROR, "Can't save event %s from treshold to file '%s'", l_atom_hash_str,
+ l_cell ? l_cell->file_storage_path : "[null]");
} else {
dap_db_set_last_hash_remote(l_sync_request->request.node_addr.uint64, l_chain, &l_atom_hash);
}
@@ -634,11 +638,11 @@ static bool s_gdb_in_pkt_proc_callback(dap_proc_thread_t *a_thread, void *a_arg)
dap_store_obj_t *l_store_obj = dap_store_unpacket_multiple((dap_store_obj_pkt_t *)l_pkt_item->pkt_data, &l_data_obj_count);
if (s_debug_more){
if (l_data_obj_count)
- log_it(L_INFO, "In: GLOBAL_DB parse: pkt_data_size=%zd, l_data_obj_count = %d",l_pkt_item->pkt_data_size, l_data_obj_count );
+ log_it(L_INFO, "In: GLOBAL_DB parse: pkt_data_size=%"DAP_UINT64_FORMAT_U", l_data_obj_count = %zu",l_pkt_item->pkt_data_size, l_data_obj_count );
else if (l_pkt_item->pkt_data){
- log_it(L_WARNING, "In: GLOBAL_DB parse: pkt_data_size=%zd, error=\"No data objs after unpack\"", l_pkt_item->pkt_data_size, l_data_obj_count );
+ log_it(L_WARNING, "In: GLOBAL_DB parse: pkt_data_size=%"DAP_UINT64_FORMAT_U", error=\"No data objs after unpack\"", l_pkt_item->pkt_data_size);
}else
- log_it(L_WARNING, "In: GLOBAL_DB parse: packet in list with NULL data(pkt_data_size:%zd)", l_pkt_item->pkt_data_size);
+ log_it(L_WARNING, "In: GLOBAL_DB parse: packet in list with NULL data(pkt_data_size:%"DAP_UINT64_FORMAT_U")", l_pkt_item->pkt_data_size);
}
uint64_t l_last_id = l_store_obj->id;
@@ -683,7 +687,7 @@ static bool s_gdb_in_pkt_proc_callback(dap_proc_thread_t *a_thread, void *a_arg)
char l_ts_str[50];
dap_time_to_str_rfc822(l_ts_str, sizeof(l_ts_str), l_store_obj[i].timestamp);
log_it(L_DEBUG, "Unpacked log history: type='%c' (0x%02hhX) group=\"%s\" key=\"%s\""
- " timestamp=\"%s\" value_len=%u ",
+ " timestamp=\"%s\" value_len=%zu ",
(char ) l_store_obj[i].type, l_store_obj[i].type, l_store_obj[i].group,
l_store_obj[i].key, l_ts_str, l_store_obj[i].value_len);
}
@@ -769,7 +773,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
return;
}
if (l_ch_pkt->hdr.size< sizeof (l_chain_pkt->hdr) ){
- log_it(L_ERROR, "Corrupted packet: too small size %zd, smaller then header size %zd", l_ch_pkt->hdr.size,
+ log_it(L_ERROR, "Corrupted packet: too small size %u, smaller then header size %zu", l_ch_pkt->hdr.size,
sizeof(l_chain_pkt->hdr));
}
@@ -816,8 +820,8 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
"ERROR_SYNC_REQUEST_ALREADY_IN_PROCESS");
break;
}
- log_it(L_INFO, "In: UPDATE_GLOBAL_DB_REQ pkt: net 0x%016x chain 0x%016x cell 0x%016x", l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
+ log_it(L_INFO, "In: UPDATE_GLOBAL_DB_REQ pkt: net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ l_chain_pkt->hdr.net_id.uint64, l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
if (l_chain_pkt_data_size == sizeof(dap_stream_ch_chain_sync_request_t))
memcpy(&l_ch_chain->request, l_chain_pkt->data, sizeof(dap_stream_ch_chain_sync_request_t));
dap_chain_node_client_t *l_client = (dap_chain_node_client_t *)l_ch_chain->callback_notify_arg;
@@ -858,8 +862,8 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
// If requested - begin to recieve record's hashes
case DAP_STREAM_CH_CHAIN_PKT_TYPE_UPDATE_GLOBAL_DB_START:{
if (s_debug_more)
- log_it(L_INFO, "In: UPDATE_GLOBAL_DB_START pkt net 0x%016x chain 0x%016x cell 0x%016x", l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
+ log_it(L_INFO, "In: UPDATE_GLOBAL_DB_START pkt net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ l_chain_pkt->hdr.net_id.uint64, l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
if (l_ch_chain->state != CHAIN_STATE_IDLE){
log_it(L_WARNING, "Can't process UPDATE_GLOBAL_DB_START request because its already busy with syncronization");
dap_stream_ch_chain_pkt_write_error_unsafe(a_ch, l_chain_pkt->hdr.net_id.uint64,
@@ -873,7 +877,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
// Response with gdb element hashes and sizes
case DAP_STREAM_CH_CHAIN_PKT_TYPE_UPDATE_GLOBAL_DB:{
if(s_debug_more)
- log_it(L_INFO, "In: UPDATE_GLOBAL_DB pkt data_size=%d ", l_chain_pkt_data_size);
+ log_it(L_INFO, "In: UPDATE_GLOBAL_DB pkt data_size=%zu", l_chain_pkt_data_size);
if (l_ch_chain->state != CHAIN_STATE_UPDATE_GLOBAL_DB_REMOTE ||
memcmp(&l_ch_chain->request_hdr, &l_chain_pkt->hdr, sizeof(dap_stream_ch_chain_pkt_t))) {
log_it(L_WARNING, "Can't process UPDATE_GLOBAL_DB request because its already busy with syncronization");
@@ -948,11 +952,11 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if(l_chain_pkt_data_size == sizeof(dap_chain_node_addr_t)){
memcpy(&l_ch_chain->request.node_addr, l_chain_pkt->data, l_chain_pkt_data_size);
l_ch_chain->stats_request_gdb_processed = 0;
- log_it(L_INFO, "In: FIRST_GLOBAL_DB data_size=%d net 0x%016x chain 0x%016x cell 0x%016x from address "NODE_ADDR_FP_STR,
- l_chain_pkt_data_size, l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64, NODE_ADDR_FP_ARGS_S(l_ch_chain->request.node_addr) );
+ log_it(L_INFO, "In: FIRST_GLOBAL_DB data_size=%zu net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x
+ " from address "NODE_ADDR_FP_STR, l_chain_pkt_data_size, l_chain_pkt->hdr.net_id.uint64 ,
+ l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64, NODE_ADDR_FP_ARGS_S(l_ch_chain->request.node_addr) );
}else {
- log_it(L_WARNING,"Incorrect data size %zd in packet DAP_STREAM_CH_CHAIN_PKT_TYPE_FIRST_GLOBAL_DB", l_chain_pkt_data_size);
+ log_it(L_WARNING,"Incorrect data size %zu in packet DAP_STREAM_CH_CHAIN_PKT_TYPE_FIRST_GLOBAL_DB", l_chain_pkt_data_size);
s_stream_ch_write_error_unsafe(a_ch, l_chain_pkt->hdr.net_id.uint64,
l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64,
"ERROR_CHAIN_PACKET_TYPE_FIRST_GLOBAL_DB_INCORRET_DATA_SIZE");
@@ -961,7 +965,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
case DAP_STREAM_CH_CHAIN_PKT_TYPE_GLOBAL_DB: {
if(s_debug_more)
- log_it(L_INFO, "In: GLOBAL_DB data_size=%d ", l_chain_pkt_data_size);
+ log_it(L_INFO, "In: GLOBAL_DB data_size=%zu", l_chain_pkt_data_size);
// get transaction and save it to global_db
if(l_chain_pkt_data_size > 0) {
struct sync_request *l_sync_request = dap_stream_ch_chain_create_sync_request(l_chain_pkt, a_ch);
@@ -979,8 +983,8 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
} break;
case DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_GLOBAL_DB: {
- log_it(L_INFO, "In: SYNCED_GLOBAL_DB: net 0x%016x chain 0x%016x cell 0x%016x", l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
+ log_it(L_INFO, "In: SYNCED_GLOBAL_DB: net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ l_chain_pkt->hdr.net_id.uint64, l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
if (!l_ch_chain->callback_notify_packet_in) { // we haven't node client waitng, so reply to other side
dap_stream_ch_chain_sync_request_t l_sync_gdb = {};
dap_chain_net_t *l_net = dap_chain_net_by_id(l_chain_pkt->hdr.net_id);
@@ -995,21 +999,22 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
l_sync_gdb.id_start = 1;
dap_chain_net_t *l_net = dap_chain_net_by_id(l_chain_pkt->hdr.net_id);
l_sync_gdb.node_addr.uint64 = dap_chain_net_get_cur_addr_int(l_net);
- log_it(L_INFO, "In: SYNC_GLOBAL_DB_RVRS pkt: net 0x%016x chain 0x%016x cell 0x%016x, request gdb sync from %u", l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id, l_sync_gdb.id_start );
+ log_it(L_INFO, "In: SYNC_GLOBAL_DB_RVRS pkt: net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x
+ ", request gdb sync from %"DAP_UINT64_FORMAT_U, l_chain_pkt->hdr.net_id.uint64 , l_chain_pkt->hdr.chain_id.uint64,
+ l_chain_pkt->hdr.cell_id.uint64, l_sync_gdb.id_start );
dap_stream_ch_chain_pkt_write_unsafe(a_ch, DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNC_GLOBAL_DB, l_chain_pkt->hdr.net_id.uint64,
l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64, &l_sync_gdb, sizeof(l_sync_gdb));
} break;
case DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_GLOBAL_DB_GROUP: {
if (s_debug_more)
- log_it(L_INFO, "In: SYNCED_GLOBAL_DB_GROUP pkt net 0x%016x chain 0x%016x cell 0x%016x", l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
+ log_it(L_INFO, "In: SYNCED_GLOBAL_DB_GROUP pkt net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ l_chain_pkt->hdr.net_id.uint64, l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
} break;
case DAP_STREAM_CH_CHAIN_PKT_TYPE_FIRST_GLOBAL_DB_GROUP: {
if (s_debug_more)
- log_it(L_INFO, "In: FIRST_GLOBAL_DB_GROUP pkt net 0x%016x chain 0x%016x cell 0x%016x", l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
+ log_it(L_INFO, "In: FIRST_GLOBAL_DB_GROUP pkt net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ l_chain_pkt->hdr.net_id.uint64, l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
} break;
/// --- Chains update ---
@@ -1023,13 +1028,13 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
break;
}
if(s_debug_more)
- log_it(L_INFO, "In: UPDATE_CHAINS_REQ pkt: net 0x%016x chain 0x%016x cell 0x%016x", l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
+ log_it(L_INFO, "In: UPDATE_CHAINS_REQ pkt: net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ l_chain_pkt->hdr.net_id.uint64, l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
dap_chain_t * l_chain = dap_chain_find_by_id(l_chain_pkt->hdr.net_id, l_chain_pkt->hdr.chain_id);
if (l_chain) {
l_ch_chain->state = CHAIN_STATE_UPDATE_CHAINS;
if(s_debug_more)
- log_it(L_INFO, "Out: UPDATE_CHAINS_START pkt: net %s chain %s cell 0x%016x", l_chain->name,
+ log_it(L_INFO, "Out: UPDATE_CHAINS_START pkt: net %s chain %s cell 0x%016"DAP_UINT64_FORMAT_X, l_chain->name,
l_chain->net_name, l_chain_pkt->hdr.cell_id.uint64);
l_ch_chain->request_atom_iter = l_chain->callback_atom_iter_create(l_chain);
l_chain->callback_atom_iter_get_first(l_ch_chain->request_atom_iter, NULL);
@@ -1170,9 +1175,9 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if (l_ch_pkt->hdr.type == DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNC_CHAINS) {
char *l_hash_from_str = dap_chain_hash_fast_to_str_new(&l_ch_chain->request.hash_from);
char *l_hash_to_str = dap_chain_hash_fast_to_str_new(&l_ch_chain->request.hash_to);
- log_it(L_INFO, "In: SYNC_CHAINS pkt: net 0x%016x chain 0x%016x cell 0x%016x between %s and %s", l_ch_chain->request_hdr.net_id.uint64 ,
- l_ch_chain->request_hdr.chain_id.uint64, l_ch_chain->request_hdr.cell_id.uint64,
- l_hash_from_str? l_hash_from_str: "(null)", l_hash_to_str?l_hash_to_str:"(null)");
+ log_it(L_INFO, "In: SYNC_CHAINS pkt: net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x
+ " between %s and %s", l_ch_chain->request_hdr.net_id.uint64, l_ch_chain->request_hdr.chain_id.uint64, l_ch_chain->request_hdr.cell_id.uint64,
+ l_hash_from_str ? l_hash_from_str : "(null)", l_hash_to_str ? l_hash_to_str : "(null)");
DAP_DELETE(l_hash_from_str);
DAP_DELETE(l_hash_to_str);
}
@@ -1190,10 +1195,10 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if(l_chain_pkt_data_size == sizeof(dap_chain_node_addr_t)){
memcpy(&l_ch_chain->request_hdr, &l_chain_pkt->hdr, sizeof(dap_stream_ch_chain_pkt_hdr_t));
memcpy(&l_ch_chain->request.node_addr, l_chain_pkt->data, sizeof(dap_chain_node_addr_t));
- log_it(L_INFO, "From "NODE_ADDR_FP_STR": FIRST_CHAIN data_size=%d net 0x%016x chain 0x%016x cell 0x%016x ",
- NODE_ADDR_FP_ARGS_S(l_ch_chain->request.node_addr),
- l_chain_pkt_data_size, l_ch_chain->request_hdr.net_id.uint64 ,
- l_ch_chain->request_hdr.chain_id.uint64, l_ch_chain->request_hdr.cell_id.uint64);
+ log_it(L_INFO, "From "NODE_ADDR_FP_STR": FIRST_CHAIN data_size=%zu net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ NODE_ADDR_FP_ARGS_S(l_ch_chain->request.node_addr),
+ l_chain_pkt_data_size, l_ch_chain->request_hdr.net_id.uint64 ,
+ l_ch_chain->request_hdr.chain_id.uint64, l_ch_chain->request_hdr.cell_id.uint64);
}else{
log_it(L_WARNING,"Incorrect data size %zd in packet DAP_STREAM_CH_CHAIN_PKT_TYPE_FIRST_CHAIN", l_chain_pkt_data_size);
s_stream_ch_write_error_unsafe(a_ch, l_chain_pkt->hdr.net_id.uint64,
@@ -1276,9 +1281,9 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if( dap_log_level_get()<= L_INFO){
char l_hash_from_str[70]={[0]='\0'};
dap_chain_hash_fast_to_str(&l_request.hash_from,l_hash_from_str,sizeof (l_hash_from_str)-1);
- log_it(L_INFO, "In: SYNC_CHAINS_RVRS pkt: net 0x%016x chain 0x%016x cell 0x%016x request chains sync from %s",
- l_chain_pkt->hdr.net_id.uint64 , l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64,
- l_hash_from_str[0] ? l_hash_from_str :"(null)");
+ log_it(L_INFO, "In: SYNC_CHAINS_RVRS pkt: net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x
+ "request chains sync from %s", l_chain_pkt->hdr.net_id.uint64, l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64,
+ l_hash_from_str[0] ? l_hash_from_str : "(null)");
}
dap_stream_ch_chain_pkt_write_unsafe(a_ch, DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNC_CHAINS, l_chain_pkt->hdr.net_id.uint64,
l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64, &l_request, sizeof(l_request));
@@ -1296,14 +1301,15 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if(l_chain_pkt_data_size>1)
l_error_str[l_chain_pkt_data_size-1]='\0'; // To be sure that nobody sends us garbage
// without trailing zero
- log_it(L_WARNING,"In from remote addr %s chain id 0x%016x got error on his side: '%s'",
+ log_it(L_WARNING,"In from remote addr %s chain id 0x%016"DAP_UINT64_FORMAT_x" got error on his side: '%s'",
l_ch_chain->ch->stream->esocket->remote_addr_str ? l_ch_chain->ch->stream->esocket->remote_addr_str: "<no addr>",
l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt_data_size > 1 ? l_error_str:"<empty>");
} break;
case DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_ALL: {
- log_it(L_INFO, "In from "NODE_ADDR_FP_STR": SYNCED_ALL net 0x%016x chain 0x%016x cell 0x%016x",NODE_ADDR_FP_ARGS_S(l_ch_chain->node_client->remote_node_addr), l_chain_pkt->hdr.net_id.uint64 ,
- l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
+ log_it(L_INFO, "In from "NODE_ADDR_FP_STR": SYNCED_ALL net 0x%016"DAP_UINT64_FORMAT_x" chain 0x%016"DAP_UINT64_FORMAT_x" cell 0x%016"DAP_UINT64_FORMAT_x,
+ NODE_ADDR_FP_ARGS_S(l_ch_chain->node_client->remote_node_addr), l_chain_pkt->hdr.net_id.uint64,
+ l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64);
} break;
default: {
@@ -1437,7 +1443,7 @@ void s_stream_ch_packet_out(dap_stream_ch_t* a_ch, void* a_arg)
if (l_pkt_size) {
// If request was from defined node_addr we update its state
if( s_debug_more)
- log_it(L_INFO, "Send one global_db packet len=%d (rest=%d/%d items)", l_pkt_size,
+ log_it(L_INFO, "Send one global_db packet len=%zu (rest=%zu/%zu items)", l_pkt_size,
dap_db_log_list_get_count_rest(l_ch_chain->request_db_log),
dap_db_log_list_get_count(l_ch_chain->request_db_log));
dap_stream_ch_chain_pkt_write_unsafe(a_ch, DAP_STREAM_CH_CHAIN_PKT_TYPE_GLOBAL_DB,
@@ -1450,7 +1456,7 @@ void s_stream_ch_packet_out(dap_stream_ch_t* a_ch, void* a_arg)
l_ch_chain->request_hdr.net_id.uint64, l_ch_chain->request_hdr.chain_id.uint64,
l_ch_chain->request_hdr.cell_id.uint64, NULL, 0);
} else {
- log_it( L_INFO,"Syncronized database: items syncronyzed %"DAP_UINT64_FORMAT_U" from %"DAP_UINT64_FORMAT_U"",
+ log_it( L_INFO,"Syncronized database: items syncronyzed %"DAP_UINT64_FORMAT_U" from %zu",
l_ch_chain->stats_request_gdb_processed, dap_db_log_list_get_count(l_ch_chain->request_db_log));
// last message
dap_stream_ch_chain_sync_request_t l_request = {};
diff --git a/modules/common/dap_chain_common.c b/modules/common/dap_chain_common.c
index e25d84909b..3189c9ec51 100644
--- a/modules/common/dap_chain_common.c
+++ b/modules/common/dap_chain_common.c
@@ -45,7 +45,7 @@ size_t dap_chain_hash_slow_to_str( dap_chain_hash_slow_t *a_hash, char *a_str, s
const size_t c_hash_str_size = sizeof(*a_hash) * 2 + 1 /*trailing zero*/+ 2 /* heading 0x */;
if(a_str_max < c_hash_str_size) {
- log_it(L_ERROR, "String for hash too small, need %u but have only %u", c_hash_str_size, a_str_max);
+ log_it(L_ERROR, "String for hash too small, need %zu but have only %zu", c_hash_str_size, a_str_max);
}
size_t i;
dap_snprintf(a_str, 3, "0x");
@@ -203,10 +203,11 @@ dap_chain_net_srv_uid_t dap_chain_net_srv_uid_from_str( const char * a_net_srv_u
l_byte[2]='\0';
// Read byte chars
- if ( sscanf(l_byte,"%02hhx",&l_ret.raw[l_pos] ) != 1)
- if( sscanf(l_byte,"%02hhX",&l_ret.raw[l_pos] ) ==1 )
+ unsigned int l_bytechar;
+ if ( sscanf(l_byte,"%02x", &l_bytechar) != 1)
+ if( sscanf(l_byte,"%02X", &l_bytechar) != 1 )
break;
-
+ l_ret.raw[l_pos] = l_bytechar;
// Update pos
l_pos++;
// Reduce in two steps to not to break if input will have bad input
diff --git a/modules/common/dap_chain_datum_token.c b/modules/common/dap_chain_datum_token.c
index 81db810637..8a7b1e7fd4 100644
--- a/modules/common/dap_chain_datum_token.c
+++ b/modules/common/dap_chain_datum_token.c
@@ -77,7 +77,7 @@ dap_tsd_t* dap_chain_datum_token_tsd_get(dap_chain_datum_token_t * a_token, size
}
if (l_tsd_size+l_hdr_size > a_token_size){
- log_it(L_WARNING, "TSD size %zd overlaps with header, corrupted data");
+ log_it(L_WARNING, "TSD size %zd overlaps with header, corrupted data", l_tsd_size);
}else if (l_tsd_size +l_hdr_size == a_token_size){
log_it(L_INFO, "No signatures at all, returning pointer to the top of data");
return (dap_tsd_t*) a_token->data_n_tsd;
diff --git a/modules/common/dap_chain_datum_tx_receipt.c b/modules/common/dap_chain_datum_tx_receipt.c
index 0a136f07fb..d4428f85e5 100644
--- a/modules/common/dap_chain_datum_tx_receipt.c
+++ b/modules/common/dap_chain_datum_tx_receipt.c
@@ -123,6 +123,6 @@ uint16_t dap_chain_datum_tx_receipt_signs_count(dap_chain_datum_tx_receipt_t * a
l_ret++;
}
if(a_receipt_size != (size_t) ((byte_t *) l_sign - (byte_t *) a_receipt) )
- log_it(L_ERROR, "Receipt 0x%x (size=%ud) is corrupted", a_receipt, a_receipt_size);
+ log_it(L_ERROR, "Receipt 0x%zu (size=%zu) is corrupted", (size_t)a_receipt, a_receipt_size);
return l_ret;
}
diff --git a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
index 3613d3acf0..1d966490e1 100644
--- a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
+++ b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
@@ -242,7 +242,7 @@ static int s_callback_new(dap_chain_t * a_chain, dap_config_t * a_chain_cfg)
l_poa_pvt->auth_certs = DAP_NEW_Z_SIZE ( dap_cert_t *, l_poa_pvt->auth_certs_count * sizeof(dap_cert_t));
char l_cert_name[512];
for (size_t i = 0; i < l_poa_pvt->auth_certs_count ; i++ ){
- dap_snprintf(l_cert_name,sizeof(l_cert_name),"%s.%lu",l_poa_pvt->auth_certs_prefix, i);
+ dap_snprintf(l_cert_name,sizeof(l_cert_name),"%s.%zu",l_poa_pvt->auth_certs_prefix, i);
if ( (l_poa_pvt->auth_certs[i] = dap_cert_find_by_name( l_cert_name)) != NULL ) {
log_it(L_NOTICE, "Initialized auth cert \"%s\"", l_cert_name);
} else{
diff --git a/modules/consensus/dag-pos/dap_chain_cs_dag_pos.c b/modules/consensus/dag-pos/dap_chain_cs_dag_pos.c
index 4e66d0704e..1ad8af8c88 100644
--- a/modules/consensus/dag-pos/dap_chain_cs_dag_pos.c
+++ b/modules/consensus/dag-pos/dap_chain_cs_dag_pos.c
@@ -23,10 +23,10 @@
*/
#include <stdlib.h>
+#include "dap_chain_net.h"
#include "dap_common.h"
#include "dap_string.h"
#include "dap_strfuncs.h"
-#include "dap_chain_net.h"
#include "dap_chain_cs.h"
#include "dap_chain_cs_dag.h"
#include "dap_chain_cs_dag_pos.h"
@@ -113,7 +113,7 @@ static int s_callback_new(dap_chain_t * a_chain, dap_config_t * a_chain_cfg)
l_pos_pvt->tokens_hold[i] = dap_strdup( l_tokens_hold[i] );
if ( ( l_pos_pvt->tokens_hold_value[i] =
strtoull(l_tokens_hold_value_str[i],NULL,10) ) == 0 ) {
- log_it(L_CRITICAL, "Token %s has inproper hold value \"%s\"",l_pos_pvt->tokens_hold[i],
+ log_it(L_CRITICAL, "Token %s has inproper hold value %"DAP_UINT64_FORMAT_U, l_pos_pvt->tokens_hold[i],
l_pos_pvt->tokens_hold_value[i] );
goto lb_err;
}
@@ -217,8 +217,6 @@ static dap_chain_cs_dag_event_t * s_callback_event_create(dap_chain_cs_dag_t * a
*/
static int s_callback_event_verify(dap_chain_cs_dag_t * a_dag, dap_chain_cs_dag_event_t * a_dag_event, size_t a_dag_event_size)
{
-
- dap_chain_cs_dag_pos_t * l_pos =DAP_CHAIN_CS_DAG_POS( a_dag ) ;
dap_chain_cs_dag_pos_pvt_t * l_pos_pvt = PVT ( DAP_CHAIN_CS_DAG_POS( a_dag ) );
if(a_dag->chain->ledger == NULL){
@@ -237,7 +235,7 @@ static int s_callback_event_verify(dap_chain_cs_dag_t * a_dag, dap_chain_cs_dag_
for ( size_t l_sig_pos=0; l_sig_pos < a_dag_event->header.signs_count; l_sig_pos++ ){
dap_sign_t * l_sign = dap_chain_cs_dag_event_get_sign(a_dag_event, a_dag_event_size,l_sig_pos);
if ( l_sign == NULL){
- log_it(L_WARNING, "Event is NOT signed with anything: sig pos %zd, event size %zd", a_dag_event_size);
+ log_it(L_WARNING, "Event is NOT signed with anything: sig pos %zu, event size %zu", l_sig_pos, a_dag_event_size);
return -4;
}
size_t l_dag_event_size_without_sign = dap_chain_cs_dag_event_calc_size_excl_signs(a_dag_event,a_dag_event_size);
@@ -314,7 +312,7 @@ static int s_callback_event_verify(dap_chain_cs_dag_t * a_dag, dap_chain_cs_dag_
// Passed all checks
return 0;
}else{
- log_it(L_WARNING, "Wrong event: only %su/%su signs are valid", l_verified_num, l_pos_pvt->confirmations_minimum );
+ log_it(L_WARNING, "Wrong event: only %hu/%hu signs are valid", l_verified_num, l_pos_pvt->confirmations_minimum );
return -2;
}
}else{
diff --git a/modules/consensus/none/dap_chain_cs_none.c b/modules/consensus/none/dap_chain_cs_none.c
index a8206306e7..f273143c72 100644
--- a/modules/consensus/none/dap_chain_cs_none.c
+++ b/modules/consensus/none/dap_chain_cs_none.c
@@ -134,7 +134,7 @@ static void s_history_callback_notify(void * a_arg, const char a_op_code, const
if (a_arg){
dap_chain_gdb_t * l_gdb = (dap_chain_gdb_t *) a_arg;
dap_chain_net_t *l_net = dap_chain_net_by_id( l_gdb->chain->net_id);
- log_it(L_DEBUG,"%s.%s: op_code='%c' group=\"%s\" key=\"%s\" value_size=%u",l_net->pub.name,
+ log_it(L_DEBUG,"%s.%s: op_code='%c' group=\"%s\" key=\"%s\" value_size=%zu",l_net->pub.name,
l_gdb->chain->name, a_op_code, a_group, a_key, a_value_size);
dap_chain_node_mempool_autoproc_notify((void *)l_net, a_op_code, a_group, a_key, a_value, a_value_size);
dap_chain_net_sync_gdb_broadcast((void *)l_net, a_op_code, a_group, a_key, a_value, a_value_size);
diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c
index 8f93e585f9..db1e342e24 100644
--- a/modules/mempool/dap_chain_mempool.c
+++ b/modules/mempool/dap_chain_mempool.c
@@ -202,7 +202,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
// Search unused out:
uint64_t l_value_need =a_tx_num*( a_value + a_value_fee );
uint64_t l_value_transfer = 0; // how many coins to transfer
- log_it(L_DEBUG,"Create %lu transactions, summary %Lf.7", a_tx_num,dap_chain_datoshi_to_coins(l_value_need) ) ;
+ log_it(L_DEBUG,"Create %"DAP_UINT64_FORMAT_U" transactions, summary %Lf.7", a_tx_num,dap_chain_datoshi_to_coins(l_value_need) ) ;
dap_list_t *l_list_used_out = dap_chain_ledger_get_list_tx_outs_with_val(a_chain->ledger, a_token_ticker,
a_addr_from, l_value_need, &l_value_transfer);
if (!l_list_used_out) {
@@ -212,7 +212,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
}
for (size_t i=0; i< a_tx_num ; i++){
- log_it(L_DEBUG, "Prepare tx %u",i);
+ log_it(L_DEBUG, "Prepare tx %zu",i);
// find the transactions from which to take away coins
// create empty transaction
@@ -333,12 +333,12 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
//return 0;
if( dap_chain_global_db_gr_save(l_objs,a_tx_num,l_gdb_group) ) {
- log_it(L_NOTICE, "%u transaction are placed in mempool", a_tx_num);
+ log_it(L_NOTICE, "%zu transaction are placed in mempool", a_tx_num);
DAP_DELETE(l_objs);
DAP_DELETE(l_gdb_group);
return 0;
}else{
- log_it(L_ERROR, "Can't place %u transactions in mempool", a_tx_num);
+ log_it(L_ERROR, "Can't place %zu transactions in mempool", a_tx_num);
DAP_DELETE(l_objs);
DAP_DELETE(l_gdb_group);
return -4;
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 9a8b56dfe9..caffb27f2c 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -436,7 +436,7 @@ static void s_fill_links_from_root_aliases(dap_chain_net_t * a_net)
pthread_rwlock_unlock(&l_pvt_net->rwlock);
} else {
log_it(L_WARNING, "Not found link %s."NODE_ADDR_FP_STR" in the node list", a_net->pub.name,
- NODE_ADDR_FPS_ARGS(l_link_addr));
+ NODE_ADDR_FP_ARGS(l_link_addr));
}
}
}
@@ -749,6 +749,7 @@ static void s_net_links_notify(dap_chain_net_t * a_net )
*/
static bool s_net_states_proc(dap_proc_thread_t *a_thread, void *a_arg)
{
+ UNUSED(a_thread);
bool l_repeat_after_exit = false; // If true - repeat on next iteration of proc thread loop
dap_chain_net_t *l_net = (dap_chain_net_t *) a_arg;
assert(l_net);
@@ -873,12 +874,12 @@ static bool s_net_states_proc(dap_proc_thread_t *a_thread, void *a_arg)
log_it(L_CRITICAL,"Can't allocate memory for node link info");
break;
}
- #ifdef DAP_OS_UNIX
+/* #ifdef DAP_OS_UNIX
struct in_addr _in_addr = { .s_addr = l_addr.s_addr };
#else
struct in_addr _in_addr = { { .S_addr = l_addr.S_un.S_addr } };
#endif
-
+*/
l_sync_fill_root_nodes = false;
if (l_net_pvt->state_target != NET_STATE_OFFLINE) {
l_net_pvt->links_dns_requests++;
@@ -919,7 +920,7 @@ static bool s_net_states_proc(dap_proc_thread_t *a_thread, void *a_arg)
case NET_STATE_LINKS_ESTABLISHED:{
log_it(L_INFO,"%s.state: NET_STATE_LINKS_ESTABLISHED", l_net->pub.name);
for (dap_list_t *l_tmp = l_net_pvt->links ; l_tmp; l_tmp = dap_list_next(l_tmp)) {
- dap_chain_node_client_t *l_link = (dap_chain_node_client_t *)l_tmp->data;
+ //dap_chain_node_client_t *l_link = (dap_chain_node_client_t *)l_tmp->data;
//
}
}break;
@@ -1567,8 +1568,9 @@ typedef struct list_priority_{
char * chains_path;
}list_priority;
-static int callback_compare_prioritity_list(const void * a_item1, const void * a_item2)
+static int callback_compare_prioritity_list(const void * a_item1, const void * a_item2, void *a_unused)
{
+ UNUSED(a_unused);
list_priority *l_item1 = (list_priority*) a_item1;
list_priority *l_item2 = (list_priority*) a_item2;
if(!l_item1 || !l_item2 || l_item1->prior == l_item2->prior)
@@ -1850,7 +1852,7 @@ int s_net_load(const char * a_net_name, uint16_t a_acl_idx)
if (dap_chain_node_alias_register(l_net,l_net_pvt->seed_aliases[i],l_seed_node_addr))
log_it(L_NOTICE,"Seed node "NODE_ADDR_FP_STR" added to the curent list",NODE_ADDR_FP_ARGS(l_seed_node_addr) );
else {
- log_it(L_WARNING,"Cant register alias %s for address "NODE_ADDR_FP_STR,NODE_ADDR_FP_ARGS(l_seed_node_addr));
+ log_it(L_WARNING,"Cant register alias %s for address "NODE_ADDR_FP_STR, l_net_pvt->seed_aliases[i], NODE_ADDR_FP_ARGS(l_seed_node_addr));
}
}else{
log_it(L_WARNING,"Cant save node info for address "NODE_ADDR_FP_STR" return code %d",
@@ -1946,7 +1948,7 @@ int s_net_load(const char * a_net_name, uint16_t a_acl_idx)
dap_chain_node_info_save(l_net,l_net_pvt->node_info);
}
- log_it(L_NOTICE,"GDB Info: node_addr: " NODE_ADDR_FP_STR" links: %u cell_id: 0x%016X ",
+ log_it(L_NOTICE,"GDB Info: node_addr: " NODE_ADDR_FP_STR" links: %u cell_id: 0x%016"DAP_UINT64_FORMAT_X,
NODE_ADDR_FP_ARGS(l_node_addr),
l_net_pvt->node_info->hdr.links_number,
l_net_pvt->node_info->hdr.cell_id.uint64);
@@ -2399,7 +2401,7 @@ void dap_chain_net_proc_mempool (dap_chain_net_t * a_net)
size_t l_objs_size = 0;
dap_global_db_obj_t * l_objs = dap_chain_global_db_gr_load(l_gdb_group_mempool, &l_objs_size);
if(l_objs_size) {
- log_it(L_INFO, "%s.%s: Found %u records :", a_net->pub.name, l_chain->name,
+ log_it(L_INFO, "%s.%s: Found %zu records :", a_net->pub.name, l_chain->name,
l_objs_size);
size_t l_datums_size = l_objs_size;
dap_chain_datum_t ** l_datums = DAP_NEW_Z_SIZE(dap_chain_datum_t*,
@@ -2437,7 +2439,7 @@ void dap_chain_net_proc_mempool (dap_chain_net_t * a_net)
}
}
if(l_objs_processed < l_datums_size)
- log_it(L_WARNING, "%s.%s: %d records not processed", a_net->pub.name, l_chain->name,
+ log_it(L_WARNING, "%s.%s: %zu records not processed", a_net->pub.name, l_chain->name,
l_datums_size - l_objs_processed);
dap_chain_global_db_objs_delete(l_objs, l_objs_size);
@@ -2579,7 +2581,7 @@ void dap_chain_net_dump_datum(dap_string_t * a_str_out, dap_chain_datum_t * a_da
size_t l_offset_max = l_token->header_private_decl.tsd_total_size;
while( l_offset< l_offset_max){
if ( (l_tsd->size+l_offset) >l_offset_max){
- log_it(L_WARNING, "<CORRUPTED TSD> too big size %zd when left maximum %zd",
+ log_it(L_WARNING, "<CORRUPTED TSD> too big size %u when left maximum %zu",
l_tsd->size, l_offset_max - l_offset);
return;
}
@@ -2694,7 +2696,7 @@ void dap_chain_net_dump_datum(dap_string_t * a_str_out, dap_chain_datum_t * a_da
while( l_offset< l_offset_max){
dap_tsd_t * l_tsd = (void*)l_tsd_first + l_offset;
if ( (l_tsd->size+l_offset) >l_offset_max){
- log_it(L_WARNING, "<CORRUPTED TSD> too big size %zd when left maximum %zd",
+ log_it(L_WARNING, "<CORRUPTED TSD> too big size %u when left maximum %zu",
l_tsd->size, l_offset_max - l_offset);
return;
}
diff --git a/modules/net/dap_chain_node.c b/modules/net/dap_chain_node.c
index e06be2f212..0d4bdda605 100644
--- a/modules/net/dap_chain_node.c
+++ b/modules/net/dap_chain_node.c
@@ -167,7 +167,7 @@ dap_chain_node_info_t* dap_chain_node_info_read( dap_chain_net_t * a_net,dap_cha
size_t node_info_size_must_be = dap_chain_node_info_get_size(l_node_info);
if(node_info_size_must_be != node_info_size) {
- log_it(L_ERROR, "Node has bad size in base=%u (must be %u)", node_info_size, node_info_size_must_be);
+ log_it(L_ERROR, "Node has bad size in base=%zu (must be %zu)", node_info_size, node_info_size_must_be);
DAP_DELETE(l_node_info);
DAP_DELETE(l_key);
return NULL;
diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c
index 1b0932f2e3..7eac74553d 100644
--- a/modules/net/dap_chain_node_cli.c
+++ b/modules/net/dap_chain_node_cli.c
@@ -276,7 +276,7 @@ static void* thread_one_client_func(void *args)
{
SOCKET newsockfd = (SOCKET) (intptr_t) args;
if(s_debug_cli)
- log_it(L_DEBUG, "new connection sockfd=%d", newsockfd);
+ log_it(L_DEBUG, "new connection sockfd=%zu", newsockfd);
int str_len, marker = 0;
int timeout = 5000; // 5 sec
@@ -394,7 +394,7 @@ static void* thread_one_client_func(void *args)
// close connection
int cs = closesocket(newsockfd);
if (s_debug_cli)
- log_it(L_DEBUG, "close connection=%d sockfd=%d", cs, newsockfd);
+ log_it(L_DEBUG, "close connection=%d sockfd=%zu", cs, newsockfd);
return NULL;
}
@@ -501,7 +501,7 @@ static void *thread_pipe_client_func( void *args )
// SOCKET newsockfd = (SOCKET) (intptr_t) args;
if(s_debug_cli)
- log_it(L_INFO, "new connection pipe = %X", hPipe );
+ log_it(L_INFO, "new connection pipe = %p", hPipe);
int str_len, marker = 0;
int timeout = 5000; // 5 sec
@@ -630,7 +630,7 @@ static void *thread_pipe_client_func( void *args )
// close connection
// int cs = closesocket(newsockfd);
- log_it( L_INFO, "close connection pipe = %X", hPipe );
+ log_it( L_INFO, "close connection pipe = %p", hPipe );
FlushFileBuffers( hPipe );
DisconnectNamedPipe( hPipe );
@@ -670,7 +670,7 @@ static void* thread_pipe_func( void *args )
NULL ); // default security attribute
if ( hPipe == INVALID_HANDLE_VALUE ) {
- log_it( L_ERROR, "CreateNamedPipe failed, GLE = %d.\n", GetLastError() );
+ log_it( L_ERROR, "CreateNamedPipe failed, GLE = %lu.\n", GetLastError() );
return NULL;
}
@@ -678,7 +678,7 @@ static void* thread_pipe_func( void *args )
if ( fConnected )
{
- log_it( L_INFO, "Client %X connected, creating a processing thread.\n", hPipe );
+ log_it( L_INFO, "Client %p connected, creating a processing thread.\n", hPipe );
pthread_create( &threadId, NULL, thread_pipe_client_func, hPipe );
pthread_detach( threadId );
@@ -712,7 +712,7 @@ static void* thread_main_func(void *args)
socklen_t size = sizeof(peer);
// received a new connection request
if((newsockfd = accept(sockfd, (struct sockaddr*) &peer, &size)) == (SOCKET) -1) {
- log_it(L_ERROR, "new connection break newsockfd=%d", newsockfd);
+ log_it(L_ERROR, "new connection break newsockfd=%zu", newsockfd);
break;
}
// create child thread for a client connection
@@ -722,7 +722,7 @@ static void* thread_main_func(void *args)
};
// close connection
int cs = closesocket(sockfd);
- log_it(L_INFO, "Exit server thread=%d socket=%d", cs, sockfd);
+ log_it(L_INFO, "Exit server thread=%d socket=%zu", cs, sockfd);
return NULL;
}
@@ -1124,7 +1124,7 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
if ( l_listen_unix_socket_path && l_listen_unix_socket_permissions ) {
if ( l_listen_unix_socket_permissions_str ) {
- dap_sscanf(l_listen_unix_socket_permissions_str,"%ou", &l_listen_unix_socket_permissions );
+ dap_sscanf(l_listen_unix_socket_permissions_str,"%hu", &l_listen_unix_socket_permissions );
}
log_it( L_INFO, "Console interace on path %s (%04o) ", l_listen_unix_socket_path, l_listen_unix_socket_permissions );
@@ -1238,7 +1238,7 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
*/
void dap_chain_node_cli_delete(void)
{
- if(server_sockfd >= 0)
+ if(server_sockfd != INVALID_SOCKET)
closesocket(server_sockfd);
#ifdef __WIN32
WSACleanup();
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 3c9cb9e875..b868834ca2 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -1112,7 +1112,7 @@ int com_node(int a_argc, char ** a_argv, void *arg_func, char **a_str_reply)
}
log_it(L_NOTICE, "Stream connection established");
- dap_stream_ch_chain_sync_request_t l_sync_request = { { 0 } };
+ 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());
// fill begin id
l_sync_request.id_start = 1;
@@ -2004,7 +2004,7 @@ int com_token_decl_sign(int argc, char ** argv, void *arg_func, char ** a_str_re
dap_sign_t * l_sign = (dap_sign_t *) l_datum_token->data_n_tsd + l_offset;
l_offset += dap_sign_get_size(l_sign);
if( dap_sign_verify(l_sign, l_datum_token, sizeof(l_datum_token->header_private)) != 1) {
- log_it(L_WARNING, "Wrong signature %u for datum_token with key %s in mempool!", l_signs_count, l_datum_hash_out_str);
+ log_it(L_WARNING, "Wrong signature %zu for datum_token with key %s in mempool!", l_signs_count, l_datum_hash_out_str);
dap_chain_node_cli_set_reply_text(a_str_reply,
"Datum %s with datum token has wrong signature %u, break process and exit",
l_datum_hash_out_str, l_signs_count );
@@ -2013,10 +2013,10 @@ int com_token_decl_sign(int argc, char ** argv, void *arg_func, char ** a_str_re
DAP_DELETE(l_gdb_group_mempool);
return -666;
}else{
- log_it(L_DEBUG,"Sign %lu passed",l_signs_count);
+ log_it(L_DEBUG,"Sign %zu passed",l_signs_count);
}
}
- log_it(L_DEBUG, "Datum %s with token declaration: %u signatures are verified well (sign_size = %u)", l_datum_hash_out_str, l_signs_count, l_signs_size);
+ log_it(L_DEBUG, "Datum %s with token declaration: %zu signatures are verified well (sign_size = %zu)", l_datum_hash_out_str, l_signs_count, l_signs_size);
// Check if all signs are present
if(l_signs_count == l_datum_token->header_private.signs_total) {
@@ -2053,7 +2053,7 @@ int com_token_decl_sign(int argc, char ** argv, void *arg_func, char ** a_str_re
l_datum_token = (dap_chain_datum_token_t*) l_datum->data;
l_datum->header.data_size = l_datum_token_size;
memcpy(l_datum_token->data_n_tsd + l_offset, l_sign, l_sign_size);
- log_it(L_DEBUG, "Added datum token declaration sign with cert %s (new size %lu)",
+ log_it(L_DEBUG, "Added datum token declaration sign with cert %s (new size %zu)",
l_certs[i]->name , l_datum_size);
DAP_DELETE(l_sign);
@@ -3021,7 +3021,7 @@ int com_token_decl(int a_argc, char ** a_argv, void *a_arg_func, char ** a_str_r
log_it(L_DEBUG,"== TX_RECEIVER_BLOCKED_ADD: %s",
dap_tsd_get_string_const(l_tsd) );
break;
- default: log_it(L_DEBUG, "== 0x%04X: binary data %zd size ",l_tsd->type, l_tsd->size );
+ default: log_it(L_DEBUG, "== 0x%04X: binary data %u size ",l_tsd->type, l_tsd->size );
}
size_t l_tsd_size = dap_tsd_size( l_tsd);
memcpy(l_datum_token->data_n_tsd + l_datum_data_offset, l_tsd, l_tsd_size);
@@ -4218,7 +4218,7 @@ int cmd_gdb_export(int argc, char ** argv, void *arg_func, char ** a_str_reply)
}
size_t l_data_size = 0;
pdap_store_obj_t l_data = dap_chain_global_db_obj_gr_get(NULL, &l_data_size, d->d_name);
- log_it(L_INFO, "Exporting group %s, number of records: %d", d->d_name, l_data_size);
+ log_it(L_INFO, "Exporting group %s, number of records: %zu", d->d_name, l_data_size);
if (!l_data_size) {
continue;
}
@@ -4301,7 +4301,7 @@ int cmd_gdb_import(int argc, char ** argv, void *arg_func, char ** a_str_reply)
struct json_object *l_json_group_name = json_object_object_get(l_group_obj, "group");
const char *l_group_name = json_object_get_string(l_json_group_name);
// proc group name
- log_it(L_INFO, "Group %d: %s", i, l_group_name);
+ log_it(L_INFO, "Group %zu: %s", i, l_group_name);
struct json_object *l_json_records = json_object_object_get(l_group_obj, "records");
size_t l_records_count = json_object_array_length(l_json_records);
pdap_store_obj_t l_group_store = DAP_NEW_Z_SIZE(dap_store_obj_t, l_records_count * sizeof(dap_store_obj_t));
diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c
index 8fc114dde2..f9a0ac260d 100644
--- a/modules/net/dap_chain_node_cli_cmd_tx.c
+++ b/modules/net/dap_chain_node_cli_cmd_tx.c
@@ -26,6 +26,7 @@
#include <stddef.h>
#include <pthread.h>
+#include "dap_chain_wallet.h"
#include "dap_common.h"
#include "dap_enc_base58.h"
#include "dap_strfuncs.h"
@@ -33,7 +34,6 @@
#include "dap_list.h"
#include "dap_hash.h"
-#include "dap_chain_wallet.h"
#include "dap_chain_datum.h"
#include "dap_chain_datum_token.h"
#include "dap_chain_datum_tx_items.h"
@@ -1171,7 +1171,7 @@ static char* dap_db_history_filter(dap_chain_t * a_chain, dap_ledger_t *a_ledger
dap_chain_datum_token_t *l_token = (dap_chain_datum_token_t*) l_datum->data;
//if(a_datum_start < 0 || (l_datum_num >= a_datum_start && l_datum_num < a_datum_end))
// datum out of page
- if(a_datum_start >= 0 && (l_datum_num+l_datum_num_global < a_datum_start || l_datum_num+l_datum_num_global >= a_datum_end)){
+ if(a_datum_start >= 0 && (l_datum_num+l_datum_num_global < (size_t)a_datum_start || l_datum_num+l_datum_num_global >= (size_t)a_datum_end)){
l_token_num++;
break;
}
@@ -1221,7 +1221,7 @@ static char* dap_db_history_filter(dap_chain_t * a_chain, dap_ledger_t *a_ledger
// emission
case DAP_CHAIN_DATUM_TOKEN_EMISSION: {
// datum out of page
- if(a_datum_start >= 0 && (l_datum_num+l_datum_num_global < a_datum_start || l_datum_num+l_datum_num_global >= a_datum_end)) {
+ if(a_datum_start >= 0 && (l_datum_num+l_datum_num_global < (size_t)a_datum_start || l_datum_num+l_datum_num_global >= (size_t)a_datum_end)) {
l_token_num++;
break;
}
@@ -1276,7 +1276,7 @@ static char* dap_db_history_filter(dap_chain_t * a_chain, dap_ledger_t *a_ledger
case DAP_CHAIN_DATUM_TX:{
// datum out of page
- if(a_datum_start >= 0 && (l_datum_num+l_datum_num_global < a_datum_start || l_datum_num+l_datum_num_global >= a_datum_end)) {
+ if(a_datum_start >= 0 && (l_datum_num+l_datum_num_global < (size_t)a_datum_start || l_datum_num+l_datum_num_global >= (size_t)a_datum_end)) {
l_tx_num++;
break;
}
diff --git a/modules/net/dap_chain_node_client.c b/modules/net/dap_chain_node_client.c
index 3ec4cd1d43..747df8f8b4 100644
--- a/modules/net/dap_chain_node_client.c
+++ b/modules/net/dap_chain_node_client.c
@@ -491,7 +491,7 @@ static void s_ch_chain_callback_notify_packet_out(dap_stream_ch_chain_t* a_ch_ch
} break;
case DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_CHAINS: {
if(s_stream_ch_chain_debug_more)
- log_it(L_INFO,"Out: chain %x sent to uplink "NODE_ADDR_FP_STR,l_node_client->cur_chain ? l_node_client->cur_chain->id.uint64 : 0, NODE_ADDR_FP_ARGS_S(l_node_client->remote_node_addr));
+ log_it(L_INFO,"Out: chain %"DAP_UINT64_FORMAT_x" sent to uplink "NODE_ADDR_FP_STR,l_node_client->cur_chain ? l_node_client->cur_chain->id.uint64 : 0, NODE_ADDR_FP_ARGS_S(l_node_client->remote_node_addr));
}break;
default: {
}
diff --git a/modules/net/dap_chain_node_ping.c b/modules/net/dap_chain_node_ping.c
index b2986f7c22..f9237097f5 100644
--- a/modules/net/dap_chain_node_ping.c
+++ b/modules/net/dap_chain_node_ping.c
@@ -24,12 +24,14 @@
//#include <sys/socket.h>
#include <time.h>
#include <errno.h>
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#define __USE_GNU /* See feature_test_macros(7) */
#include <pthread.h>
-#include "dap_common.h"
#include "dap_client.h"
+#include "dap_common.h"
#include "dap_strfuncs.h"
#include "dap_list.h"
#include "dap_chain_common.h"
@@ -77,7 +79,7 @@
static void* node_ping_proc(void *a_arg)
{
- struct in_addr l_addr = { 0 };
+ struct in_addr l_addr = {};
int l_port = 0;
int l_count;
if(!a_arg)
@@ -150,7 +152,7 @@ static void* node_ping_proc(void *a_arg)
DAP_DELETE(host4);
closesocket(l_socket);
}
- return (void*) res;
+ return (void*)(size_t)res;
}
// start sending ping
diff --git a/modules/net/include/dap_chain_node_cli.h b/modules/net/include/dap_chain_node_cli.h
index 361a0e3846..896b0070d9 100644
--- a/modules/net/include/dap_chain_node_cli.h
+++ b/modules/net/include/dap_chain_node_cli.h
@@ -25,12 +25,11 @@
#pragma once
+#include "dap_events_socket.h"
#include "dap_common.h"
#include "dap_config.h"
#include "uthash.h"
-#include "dap_events_socket.h"
-
typedef int cmdfunc_t(int argc, char ** argv, void *arg_func, char **str_reply);
typedef void cmd_item_func_override_log_cmd_call(const char*);
diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c
index 2776ffc375..9206a63eba 100644
--- a/modules/net/srv/dap_chain_net_srv.c
+++ b/modules/net/srv/dap_chain_net_srv.c
@@ -498,7 +498,7 @@ static int s_cli_net_srv( int argc, char **argv, void *arg_func, char **a_str_re
if (dap_chain_node_addr_from_str( &l_node_addr, l_node_addr_str ) == 0 )
log_it( L_DEBUG, "node addr " NODE_ADDR_FP_STR, NODE_ADDR_FP_ARGS_S(l_node_addr) );
else
- log_it( L_ERROR, "Can't parse \"%s\" as node addr");
+ log_it( L_ERROR, "Can't parse \"%s\" as node addr", l_node_addr_str);
}
if (l_tx_cond_hash_str)
dap_chain_hash_fast_from_str (l_tx_cond_hash_str, &l_tx_cond_hash);
diff --git a/modules/net/srv/libmaxminddb/mmdblookup.c b/modules/net/srv/libmaxminddb/mmdblookup.c
index da4bb601ef..359a812eeb 100644
--- a/modules/net/srv/libmaxminddb/mmdblookup.c
+++ b/modules/net/srv/libmaxminddb/mmdblookup.c
@@ -340,8 +340,14 @@ LOCAL void dump_meta(MMDB_s *mmdb)
char date[40];
const time_t epoch = (const time_t)mmdb->metadata.build_epoch;
+#ifdef DAP_OS_WINDOWS
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#endif
strftime(date, 40, "%F %T UTC", gmtime(&epoch));
-
+#ifdef DAP_OS_WINDOWS
+#pragma GCC diagnostic pop
+#endif
fprintf(stdout, meta_dump,
mmdb->metadata.node_count,
mmdb->metadata.record_size,
diff --git a/modules/service/stake/dap_chain_net_srv_stake.c b/modules/service/stake/dap_chain_net_srv_stake.c
index b5cd774ea8..d6d2269bc4 100644
--- a/modules/service/stake/dap_chain_net_srv_stake.c
+++ b/modules/service/stake/dap_chain_net_srv_stake.c
@@ -23,10 +23,10 @@
*/
#include <math.h>
+#include "dap_chain_node_cli.h"
#include "dap_string.h"
#include "dap_enc_base58.h"
#include "dap_chain_common.h"
-#include "dap_chain_node_cli.h"
#include "dap_chain_mempool.h"
#include "dap_chain_net_srv_common.h"
#include "dap_chain_net_srv_stake.h"
diff --git a/modules/service/xchange/dap_chain_net_srv_xchange.c b/modules/service/xchange/dap_chain_net_srv_xchange.c
index eb27c36403..bd6250b275 100644
--- a/modules/service/xchange/dap_chain_net_srv_xchange.c
+++ b/modules/service/xchange/dap_chain_net_srv_xchange.c
@@ -23,9 +23,9 @@
*/
#include <math.h>
+#include "dap_chain_node_cli.h"
#include "dap_string.h"
#include "dap_chain_common.h"
-#include "dap_chain_node_cli.h"
#include "dap_chain_mempool.h"
#include "dap_chain_net_srv_common.h"
#include "dap_chain_net_srv_xchange.h"
diff --git a/modules/type/blocks/dap_chain_block.c b/modules/type/blocks/dap_chain_block.c
index 643bb69c8f..e9a6836f5f 100644
--- a/modules/type/blocks/dap_chain_block.c
+++ b/modules/type/blocks/dap_chain_block.c
@@ -128,11 +128,11 @@ size_t dap_chain_block_meta_add(dap_chain_block_t ** a_block_ptr, size_t a_block
return 0;
}
if(l_block->hdr.meta_count == UINT16_MAX){
- log_it(L_ERROR,"Meta add: Can't add more, maximum meta count %u is achieved", UINT16_MAX);
+ log_it(L_ERROR,"Meta add: Can't add more, maximum meta count %hu is achieved", UINT16_MAX);
return 0;
}
if( UINT32_MAX - l_block->hdr.meta_n_datum_n_signs_size < a_data_size + sizeof (l_meta->hdr) ){
- log_it(L_ERROR,"Meta add: Can't add more, maximum block data section size %zd achieved", UINT32_MAX);
+ log_it(L_ERROR,"Meta add: Can't add more, maximum block data section size %u achieved", UINT32_MAX);
return 0;
}
@@ -187,7 +187,7 @@ size_t dap_chain_block_datum_add(dap_chain_block_t ** a_block_ptr, size_t a_bloc
}
// Check if size of of block size
if (l_datum_size+l_offset >(a_block_size-sizeof (l_block->hdr))){
- log_it(L_ERROR,"Datum size is too big %zf thats with offset %zd is bigger than block size %zd (without header)", l_datum_size, l_offset,
+ log_it(L_ERROR,"Datum size is too big %zu thats with offset %zu is bigger than block size %zu (without header)", l_datum_size, l_offset,
(a_block_size-sizeof (l_block->hdr)));
return a_block_size;
}
@@ -208,7 +208,7 @@ size_t dap_chain_block_datum_add(dap_chain_block_t ** a_block_ptr, size_t a_bloc
l_block->hdr.meta_n_datum_n_signs_size = l_offset;
return l_offset+sizeof (l_block->hdr);
}else{
- log_it(L_ERROR,"");
+ //log_it(L_ERROR,"");
return a_block_size;
}
}
@@ -243,7 +243,7 @@ size_t dap_chain_block_datum_del_by_hash(dap_chain_block_t ** a_block_ptr, size_
}
// Check if size of of block size
if (l_datum_size+l_offset >(a_block_size-sizeof (l_block->hdr))){
- log_it(L_ERROR,"Datum size is too big %zf thats with offset %zd is bigger than block size %zd(without hdr)", l_datum_size, l_offset,
+ log_it(L_ERROR,"Datum size is too big %zu thats with offset %zu is bigger than block size %zu(without hdr)", l_datum_size, l_offset,
(a_block_size-sizeof (l_block->hdr)));
return a_block_size;
}
@@ -301,7 +301,7 @@ static size_t s_block_get_sign_offset(dap_chain_block_t * a_block, size_t a_bloc
}
// Check if size of of block size
if ( (l_datum_size+l_offset) > (a_block_size-sizeof (a_block->hdr)) ){
- log_it(L_ERROR,"Datum size is too big %zf thats with offset %zd is bigger than block size %zd", l_datum_size, l_offset, a_block_size);
+ log_it(L_ERROR,"Datum size is too big %zu thats with offset %zu is bigger than block size %zu", l_datum_size, l_offset, a_block_size);
return a_block_size;
}
l_offset += l_datum_size;
@@ -400,7 +400,7 @@ dap_chain_datum_t** dap_chain_block_get_datums(dap_chain_block_t * a_block, size
}
// Check if size of of block size
if (l_datum_size+l_offset >(a_block_size-sizeof (a_block->hdr))){
- log_it(L_ERROR,"Datum size is too big %zf thats with offset %zd is bigger than block size %zd (without header)", l_datum_size, l_offset,
+ log_it(L_ERROR,"Datum size is too big %zu thats with offset %zu is bigger than block size %zu (without header)", l_datum_size, l_offset,
(a_block_size-sizeof (a_block->hdr)));
return l_ret;
}
@@ -428,7 +428,7 @@ dap_chain_datum_t** dap_chain_block_get_datums(dap_chain_block_t * a_block, size
dap_chain_block_meta_t** dap_chain_block_get_meta(dap_chain_block_t * a_block, size_t a_block_size,size_t * a_meta_count )
{
if( a_block_size < sizeof(a_block->hdr) ){
- log_it(L_ERROR,"Meta add: Corrupted block size %zd thats smaller then block header size %zd ", a_block_size, sizeof (a_block->hdr));
+ log_it(L_ERROR,"Meta add: Corrupted block size %zu thats smaller then block header size %zu ", a_block_size, sizeof (a_block->hdr));
}
*a_meta_count = a_block->hdr.meta_count;
if (a_block->hdr.meta_count ==0) // no meta - nothing to return
@@ -489,7 +489,7 @@ void dap_chain_block_meta_extract(dap_chain_block_meta_t ** a_meta, size_t a_met
switch (l_meta->hdr.type) {
case DAP_CHAIN_BLOCK_META_GENESIS:
if(l_was_genesis){
- log_it(L_WARNING, "Genesis meta could be only one in the block, meta #%u is ignored ", i);
+ log_it(L_WARNING, "Genesis meta could be only one in the block, meta #%zu is ignored ", i);
break;
}
l_was_genesis = true;
@@ -498,7 +498,7 @@ void dap_chain_block_meta_extract(dap_chain_block_meta_t ** a_meta, size_t a_met
break;
case DAP_CHAIN_BLOCK_META_PREV:
if(l_was_prev){
- log_it(L_WARNING, "Prev meta could be only one in the block, meta #%u is ignored ", i);
+ log_it(L_WARNING, "Prev meta could be only one in the block, meta #%zu is ignored ", i);
break;
}
l_was_prev = true;
@@ -506,12 +506,12 @@ void dap_chain_block_meta_extract(dap_chain_block_meta_t ** a_meta, size_t a_met
if (l_meta->hdr.data_size == sizeof (*a_block_prev_hash) )
memcpy(a_block_prev_hash, l_meta->data, l_meta->hdr.data_size);
else
- log_it(L_WARNING, "Meta #%zd PREV has wrong size %zd when expecting %zd",i, l_meta->hdr.data_size, sizeof (*a_block_prev_hash));
+ log_it(L_WARNING, "Meta #%zu PREV has wrong size %hu when expecting %zu",i, l_meta->hdr.data_size, sizeof (*a_block_prev_hash));
}
break;
case DAP_CHAIN_BLOCK_META_ANCHOR:
if(l_was_anchor){
- log_it(L_WARNING, "Anchor meta could be only one in the block, meta #%u is ignored ", i);
+ log_it(L_WARNING, "Anchor meta could be only one in the block, meta #%zu is ignored ", i);
break;
}
l_was_anchor = true;
@@ -519,7 +519,7 @@ void dap_chain_block_meta_extract(dap_chain_block_meta_t ** a_meta, size_t a_met
if (l_meta->hdr.data_size == sizeof (*a_block_anchor_hash) )
memcpy(a_block_anchor_hash, l_meta->data, l_meta->hdr.data_size);
else
- log_it(L_WARNING, "Anchor meta #%zd has wrong size %zd when expecting %zd",i, l_meta->hdr.data_size, sizeof (*a_block_prev_hash));
+ log_it(L_WARNING, "Anchor meta #%zu has wrong size %hu when expecting %zu",i, l_meta->hdr.data_size, sizeof (*a_block_prev_hash));
}
break;
case DAP_CHAIN_BLOCK_META_LINK:
@@ -536,12 +536,12 @@ void dap_chain_block_meta_extract(dap_chain_block_meta_t ** a_meta, size_t a_met
memcpy(&a_block_links[*a_block_links_count], l_meta->data, l_meta->hdr.data_size);
(*a_block_links_count)++;
}else
- log_it(L_WARNING, "Link meta #%zd has wrong size %zd when expecting %zd", i, l_meta->hdr.data_size, sizeof (*a_block_prev_hash));
+ log_it(L_WARNING, "Link meta #%zu has wrong size %hu when expecting %zu", i, l_meta->hdr.data_size, sizeof (*a_block_prev_hash));
}
break;
case DAP_CHAIN_BLOCK_META_NONCE:
if(l_was_nonce){
- log_it(L_WARNING, "NONCE could be only one in the block, meta #%u is ignored ", i);
+ log_it(L_WARNING, "NONCE could be only one in the block, meta #%zu is ignored ", i);
break;
}
l_was_nonce = true;
@@ -550,12 +550,12 @@ void dap_chain_block_meta_extract(dap_chain_block_meta_t ** a_meta, size_t a_met
if (l_meta->hdr.data_size == sizeof (*a_nonce ) )
memcpy(a_nonce, l_meta->data, l_meta->hdr.data_size);
else
- log_it(L_WARNING, "NONCE meta #%zd has wrong size %zd when expecting %zd",i, l_meta->hdr.data_size, sizeof (*a_nonce));
+ log_it(L_WARNING, "NONCE meta #%zu has wrong size %hu when expecting %zu",i, l_meta->hdr.data_size, sizeof (*a_nonce));
}
break;
case DAP_CHAIN_BLOCK_META_NONCE2:
if(l_was_nonce2){
- log_it(L_WARNING, "NONCE2 could be only one in the block, meta #%u is ignored ", i);
+ log_it(L_WARNING, "NONCE2 could be only one in the block, meta #%zu is ignored ", i);
break;
}
l_was_nonce2 = true;
@@ -563,10 +563,10 @@ void dap_chain_block_meta_extract(dap_chain_block_meta_t ** a_meta, size_t a_met
if (l_meta->hdr.data_size == sizeof (*a_nonce2 ) )
memcpy(a_nonce2, l_meta->data, l_meta->hdr.data_size);
else
- log_it(L_WARNING, "NONCE2 meta #%zd has wrong size %zd when expecting %zd",i, l_meta->hdr.data_size, sizeof (*a_nonce2));
+ log_it(L_WARNING, "NONCE2 meta #%zd has wrong size %hu when expecting %zu",i, l_meta->hdr.data_size, sizeof (*a_nonce2));
}
break;
- default: { log_it(L_WARNING, "Unknown meta #%zd type 0x%02x (size %zd), possible corrupted block or you need to upgrade your software",
+ default: { log_it(L_WARNING, "Unknown meta #%zu type 0x%02hx (size %hu), possible corrupted block or you need to upgrade your software",
i, l_meta->hdr.type, l_meta->hdr.type); }
}
}
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 19a46d4e4d..208911e712 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -22,10 +22,10 @@
*/
#include <pthread.h>
+#include "dap_chain_net.h"
#include "dap_common.h"
#include "dap_enc_base58.h"
#include "dap_chain.h"
-#include "dap_chain_net.h"
#include "dap_chain_cs.h"
#include "dap_chain_cs_blocks.h"
#include "dap_chain_block.h"
@@ -647,7 +647,7 @@ static int s_add_atom_to_ledger(dap_chain_cs_blocks_t * a_blocks, dap_ledger_t
l_ret=-1;
}
if (l_ret != 0 ){
- log_it(L_WARNING, "Can't load datum #%d (%s) from block %s to ledger: code %d", i,
+ log_it(L_WARNING, "Can't load datum #%zu (%s) from block %s to ledger: code %d", i,
dap_chain_datum_type_id_to_str(l_datum->header.type_id),
a_block_cache->block_hash_str, l_ret);
break;
diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c
index d9f87a5865..877df35f02 100644
--- a/modules/type/dag/dap_chain_cs_dag.c
+++ b/modules/type/dag/dap_chain_cs_dag.c
@@ -597,7 +597,7 @@ static size_t s_chain_callback_datums_pool_proc(dap_chain_t * a_chain, dap_chain
if(l_atom_treshold) {
int l_res = dap_chain_cell_file_append(l_cell, l_atom_treshold, l_atom_treshold_size);
if(l_res < 0) {
- log_it(L_ERROR, "Can't save event 0x%x from treshold to the file '%s'",
+ log_it(L_ERROR, "Can't save event %p from treshold to the file '%s'",
l_atom_treshold, l_cell ? l_cell->file_storage_path : "[null]");
}
}
@@ -854,7 +854,7 @@ int dap_chain_cs_dag_event_verify_hashes_with_treshold(dap_chain_cs_dag_t * a_da
//looks like an alternative genesis event
return DAP_THRESHOLD_CONFLICTING;
}
- dap_dag_threshold_verification_res_t ret;
+ dap_dag_threshold_verification_res_t ret = DAP_THRESHOLD_OK;
for (size_t i = 0; i< a_event->header.hash_count; i++) {
dap_chain_hash_fast_t * l_hash = ((dap_chain_hash_fast_t *) a_event->hashes_n_datum_n_signs) + i;
dap_chain_cs_dag_event_item_t * l_event_search = NULL;
@@ -903,24 +903,25 @@ dap_chain_cs_dag_event_item_t* dap_chain_cs_dag_proc_treshold(dap_chain_cs_dag_t
HASH_DEL(PVT(a_dag)->events_treshold,l_event_item);
if(ret == DAP_THRESHOLD_OK){
- char * l_event_hash_str = dap_chain_hash_fast_to_str_new(&l_event_item->hash);
- if(s_debug_more)
+
+ if(s_debug_more) {
+ char * l_event_hash_str = dap_chain_hash_fast_to_str_new(&l_event_item->hash);
log_it(L_DEBUG, "Processing event (threshold): %s...", l_event_hash_str);
+ DAP_DELETE(l_event_hash_str);
+ }
int l_add_res = s_dap_chain_add_atom_to_events_table(a_dag, a_ledger, l_event_item);
HASH_ADD(hh, PVT(a_dag)->events,hash,sizeof (l_event_item->hash), l_event_item);
s_dag_events_lasts_process_new_last_event(a_dag, l_event_item);
if(! l_add_res){
if(s_debug_more)
- log_it(L_INFO, "... moved from treshold to main chains", l_event_hash_str);
- DAP_DELETE(l_event_hash_str);
+ log_it(L_INFO, "... moved from treshold to main chains");
res = true;
break;
}else{
if(s_debug_more)
- log_it(L_WARNING, "... error adding", l_event_hash_str);
+ log_it(L_WARNING, "... error adding");
//todo: delete event
}
- DAP_DELETE(l_event_hash_str);
//res = true;
}else if(ret == DAP_THRESHOLD_CONFLICTING)
HASH_ADD(hh, PVT(a_dag)->events_treshold_conflicted, hash,sizeof (l_event_item->hash), l_event_item);
@@ -979,7 +980,7 @@ static dap_chain_atom_iter_t* s_chain_callback_atom_iter_create(dap_chain_t * a_
l_atom_iter->chain = a_chain;
pthread_rwlock_rdlock(&a_chain->atoms_rwlock);
#ifdef WIN32
- log_it(L_DEBUG, "! Create caller id %d", GetThreadId(GetCurrentThread()));
+ log_it(L_DEBUG, "! Create caller id %lu", GetThreadId(GetCurrentThread()));
#endif
return l_atom_iter;
}
@@ -1194,7 +1195,7 @@ static void s_chain_callback_atom_iter_delete(dap_chain_atom_iter_t * a_atom_ite
{
pthread_rwlock_unlock(&a_atom_iter->chain->atoms_rwlock);
#ifdef WIN32
- log_it(L_DEBUG, "! Delete caller id %d", GetThreadId(GetCurrentThread()));
+ log_it(L_DEBUG, "! Delete caller id %lu", GetThreadId(GetCurrentThread()));
#endif
DAP_DELETE(a_atom_iter);
}
diff --git a/modules/wallet/dap_chain_wallet.c b/modules/wallet/dap_chain_wallet.c
index 9d7772374e..610f390aa4 100644
--- a/modules/wallet/dap_chain_wallet.c
+++ b/modules/wallet/dap_chain_wallet.c
@@ -230,7 +230,7 @@ dap_pkey_t* dap_chain_wallet_get_pkey( dap_chain_wallet_t * a_wallet,uint32_t a_
if( l_wallet_internal->certs_count > a_pkey_idx ){
return dap_cert_to_pkey(l_wallet_internal->certs[a_pkey_idx]);
}else{
- log_it( L_WARNING, "No pkey with index %u in the wallet (total size %u)",a_pkey_idx,l_wallet_internal->certs_count);
+ log_it( L_WARNING, "No pkey with index %u in the wallet (total size %zu)",a_pkey_idx,l_wallet_internal->certs_count);
return 0;
}
}
@@ -264,7 +264,7 @@ dap_enc_key_t* dap_chain_wallet_get_key( dap_chain_wallet_t * a_wallet,uint32_t
l_wallet_internal->certs[a_pkey_idx]->enc_key
: NULL;
}else{
- log_it( L_WARNING, "No key with index %u in the wallet (total size %u)",a_pkey_idx,l_wallet_internal->certs_count);
+ log_it( L_WARNING, "No key with index %u in the wallet (total size %zu)",a_pkey_idx,l_wallet_internal->certs_count);
return 0;
}
}
diff --git a/modules/wallet/include/dap_chain_wallet.h b/modules/wallet/include/dap_chain_wallet.h
index dc056103af..f1b3e81e59 100644
--- a/modules/wallet/include/dap_chain_wallet.h
+++ b/modules/wallet/include/dap_chain_wallet.h
@@ -23,12 +23,12 @@
*/
#pragma once
+#include "dap_chain_net.h"
#include "dap_chain_common.h"
#include "dap_enc_key.h"
#include "dap_pkey.h"
#include "dap_sign.h"
#include "dap_cert.h"
-#include "dap_chain_net.h"
typedef struct dap_chain_wallet{
char * name;
--
GitLab