From 23ef6675fad0608daece130ab5d61c65a3e3fd9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?=
<alexander.lysikov@demlabs.net>
Date: Tue, 18 Jun 2019 15:43:16 +0500
Subject: [PATCH] a few fix
---
dap_chain_net.c | 12 +++++++++---
dap_chain_node_client.c | 6 +++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dap_chain_net.c b/dap_chain_net.c
index af39eb127d..daa5646928 100644
--- a/dap_chain_net.c
+++ b/dap_chain_net.c
@@ -515,7 +515,7 @@ static void * s_net_proc_thread ( void * a_net)
s_net_states_proc(l_net);
pthread_mutex_lock( &PVT(l_net)->state_mutex );
- int l_timeout_ms = 3000;// 3 sec
+ int l_timeout_ms = 20000;// 20 sec
// prepare for signal waiting
struct timespec l_to;
clock_gettime(CLOCK_MONOTONIC, &l_to);
@@ -670,7 +670,7 @@ int dap_chain_net_init()
static int s_cli_net(int argc, char ** argv, char **a_str_reply)
{
int arg_index=1;
- dap_chain_net_t * l_net;
+ dap_chain_net_t * l_net = NULL;
int ret = dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,argc,argv,a_str_reply,NULL,&l_net);
if ( l_net ){
@@ -952,7 +952,7 @@ int dap_chain_net_load(const char * a_net_name)
DAP_DELETE( l_seed_nodes_ipv4);
DAP_DELETE(l_seed_nodes_addrs);
- if ( l_node_alias_str ){
+ if ( l_node_addr_str || l_node_alias_str ){
dap_chain_node_addr_t * l_node_addr;
if ( l_node_addr_str == NULL)
l_node_addr = dap_chain_node_alias_find(l_net, l_node_alias_str);
@@ -971,6 +971,8 @@ int dap_chain_net_load(const char * a_net_name)
}
if ( l_node_addr ) {
char *l_addr_hash_str = dap_chain_node_addr_to_hash_str(l_node_addr);
+ // save current node address
+ dap_db_set_cur_node_addr(l_node_addr->uint64);
if(!l_addr_hash_str){
log_it(L_ERROR,"Can't get hash string for node address!");
} else {
@@ -986,6 +988,9 @@ int dap_chain_net_load(const char * a_net_name)
}
}
}
+ else{
+ log_it(L_WARNING, "Not present our own address %s in database", (l_node_alias_str) ? l_node_alias_str: "");
+ }
}
@@ -1170,6 +1175,7 @@ dap_chain_t * dap_chain_net_get_chain_by_name( dap_chain_net_t * l_net, const ch
*/
dap_chain_node_addr_t * dap_chain_net_get_cur_addr( dap_chain_net_t * l_net)
{
+ dap_chain_net_pvt_t *pvt_dbg = PVT(l_net);
return PVT(l_net)->node_info? &PVT(l_net)->node_info->hdr.address: PVT(l_net)->node_addr;
}
diff --git a/dap_chain_node_client.c b/dap_chain_node_client.c
index 15635f81a9..c2a29e7f7c 100644
--- a/dap_chain_node_client.c
+++ b/dap_chain_node_client.c
@@ -132,7 +132,7 @@ static void s_stage_status_error_callback(dap_client_t *a_client, void *a_arg)
static void s_stage_connected_callback(dap_client_t *a_client, void *a_arg)
{
dap_chain_node_client_t *l_node_client = a_client->_inheritor;
- assert(l_node_client);
+ //assert(l_node_client);
if(l_node_client) {
log_it(L_NOTICE,"Stream connection with node " NODE_ADDR_FP_STR " established",
NODE_ADDR_FP_ARGS_S( l_node_client->remote_node_addr) );
@@ -195,10 +195,10 @@ static void s_ch_chain_callback_notify_packet_in(dap_stream_ch_chain_t* a_ch_cha
l_request = (dap_stream_ch_chain_sync_request_t* ) a_pkt->data;
if ( l_request ){
- if ( l_request->ts_start < (uint64_t) dap_db_log_get_last_timestamp() ){
+ if ( l_request->ts_start < (uint64_t) dap_db_log_get_last_id() ){
log_it(L_INFO, "Remote is synced but we have updates for it");
// Get log diff
- a_ch_chain->request_last_ts = dap_db_log_get_last_timestamp();
+ a_ch_chain->request_last_ts = dap_db_log_get_last_id();
dap_list_t *l_list = dap_db_log_get_list((time_t) l_request->ts_start);
if ( l_list ) {
--
GitLab