From b99d97764407edb37e820e14bd5911e266f4fb05 Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Sat, 21 Aug 2021 07:59:33 +0300 Subject: [PATCH 1/2] [*] Stable odrers check with CDB --- CMakeLists.txt | 2 +- cellframe-sdk | 2 +- sources/main.c | 9 ++++----- sources/sig_unix_handler.c | 2 ++ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7415efdc9..17bc908c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 4) SET( CPACK_PACKAGE_VERSION_MINOR 4) -SET( CPACK_PACKAGE_VERSION_PATCH 25) +SET( CPACK_PACKAGE_VERSION_PATCH 26) # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"") diff --git a/cellframe-sdk b/cellframe-sdk index f5fc13b5e..5fcf68bae 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit f5fc13b5e9e9e4ebcea359e2ee1a177391d00d2f +Subproject commit 5fcf68baef46413692d4975433a6235547916f9a diff --git a/sources/main.c b/sources/main.c index 1f402d6a4..7528103da 100755 --- a/sources/main.c +++ b/sources/main.c @@ -86,8 +86,6 @@ #ifdef DAP_OS_LINUX #include "dap_chain_net_srv_vpn.h" -#include "dap_chain_net_srv_vpn_cdb.h" -#include "dap_chain_net_srv_vpn_cdb_server_list.h" #include "dap_chain_net_vpn_client.h" #endif @@ -484,12 +482,12 @@ int main( int argc, const char **argv ) } - + //dap_chain_net_vpn_client_check(dap_chain_net_by_name("kelvin-testnet"), "161.35.145.253", NULL, 80, -1, -1, -1); + //dap_chain_net_vpn_client_check(dap_chain_net_by_name("kelvin-testnet"), "135.181.37.253", NULL, 80, -1, -1, -1); + //dap_chain_net_vpn_client_check(dap_chain_net_by_name("kelvin-testnet"), "164.90.189.80", NULL, 80, -1, -1, -1); //dap_chain_net_load_all(); - - //Init python plugins #ifdef DAP_SUPPORT_PYTHON_PLUGINS log_it(L_NOTICE, "Loading python plugins"); @@ -517,6 +515,7 @@ int main( int argc, const char **argv ) dap_chain_net_srv_xchange_deinit(); dap_chain_net_srv_stake_deinit(); dap_chain_net_deinit(); + dap_modules_dynamic_close_cdb(); dap_chain_global_db_deinit(); dap_chain_deinit(); dap_config_close( g_config ); diff --git a/sources/sig_unix_handler.c b/sources/sig_unix_handler.c index c5d5bead1..4e6c203c1 100644 --- a/sources/sig_unix_handler.c +++ b/sources/sig_unix_handler.c @@ -17,6 +17,7 @@ #include "dap_http.h" #include "dap_chain_node_dns_server.h" #include "sig_unix_handler.h" +#include "dap_modules_dynamic_cdb.h" #define LOG_TAG "sig_unix_handler" @@ -49,6 +50,7 @@ static void sig_exit_handler(int sig_code) { dap_enc_ks_deinit(); enc_http_deinit(); dap_http_deinit(); + dap_modules_dynamic_close_cdb(); dap_dns_server_stop(); dap_server_deinit(); dap_events_stop_all(); -- GitLab From d1fb3fc3cd30b8859566188b2509d583f2421e9f Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Sat, 21 Aug 2021 08:10:13 +0300 Subject: [PATCH 2/2] [*] Garbage cleanup --- sources/main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sources/main.c b/sources/main.c index 7528103da..29a45248c 100755 --- a/sources/main.c +++ b/sources/main.c @@ -481,11 +481,6 @@ int main( int argc, const char **argv ) } } - - //dap_chain_net_vpn_client_check(dap_chain_net_by_name("kelvin-testnet"), "161.35.145.253", NULL, 80, -1, -1, -1); - //dap_chain_net_vpn_client_check(dap_chain_net_by_name("kelvin-testnet"), "135.181.37.253", NULL, 80, -1, -1, -1); - //dap_chain_net_vpn_client_check(dap_chain_net_by_name("kelvin-testnet"), "164.90.189.80", NULL, 80, -1, -1, -1); - //dap_chain_net_load_all(); //Init python plugins -- GitLab