diff --git a/CMakeLists.txt b/CMakeLists.txt index ede3e4c4e1fe8739763538a1dd95d96403e6c16e..32e96be9f2475262c1e82169f873bfc9634e6b66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 5) -SET( CPACK_PACKAGE_VERSION_PATCH 13) +SET( CPACK_PACKAGE_VERSION_PATCH 16) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") @@ -163,6 +163,7 @@ add_subdirectory(libdap-stream-ch-vpn) add_subdirectory(libdap-stream-ch-chain) add_subdirectory(libdap-stream-ch-chain-net) add_subdirectory(libdap-stream-ch-chain-net-srv) + add_subdirectory(libdap-chain-global-db) #add_subdirectory(libdap-stream-ch-chat) @@ -182,12 +183,12 @@ if(WIN32) add_executable(${PROJECT_NAME}-cli "sources/main_node_cli.c" "sources/main_node_cli_shell.c" "sources/main_node_cli_net.c" ) add_executable(${PROJECT_NAME}-tool "sources/main_node_tool.c" ) - target_link_libraries(${PROJECT_NAME}-cli dap_chain_net + target_link_libraries(${PROJECT_NAME}-cli dap_chain_net ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmagic[x86_64CLANG].a - ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/cuttdb[x86_64CLANG].a + #${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/cuttdb[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/regex[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a @@ -226,13 +227,13 @@ if(WIN32) dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db dap_chain_net_srv_datum dap_chain_net_srv_datum_pool - dap_chain_wallet dap_chain_global_db dap_chain_mempool + dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_cuttdb ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmagic[x86_64CLANG].a - ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/cuttdb[x86_64CLANG].a + #${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/cuttdb[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/regex[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a @@ -273,12 +274,12 @@ if(WIN32) dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db dap_chain_net_srv_datum dap_chain_net_srv_datum_pool - dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb + dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmagic[x86_64CLANG].a - ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/cuttdb[x86_64CLANG].a + #${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/cuttdb[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/regex[x86_64CLANG].a ${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 72b628ff205595aa2f87819b8955fb81705c7c73..1419a98d73dcc1927f59645e97b23adb813b47aa 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 72b628ff205595aa2f87819b8955fb81705c7c73 +Subproject commit 1419a98d73dcc1927f59645e97b23adb813b47aa diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index f15809e9abf5d54642cc84dae4fe73666eda5a38..de7dfea17d8422d46f382d38a3f279eab30089fb 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit f15809e9abf5d54642cc84dae4fe73666eda5a38 +Subproject commit de7dfea17d8422d46f382d38a3f279eab30089fb diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index 01afd8dc04708458fb742c36a0a5b49e01dd6716..724e2c7b8f8f3d61d4bdc81d5b184cff7176434e 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit 01afd8dc04708458fb742c36a0a5b49e01dd6716 +Subproject commit 724e2c7b8f8f3d61d4bdc81d5b184cff7176434e diff --git a/sources/main.c b/sources/main.c index 256dae42298440834c5d81ab1e505e3e023e584f..34ab41faacdc6f88f1e0c3939415f4153364bc0d 100644 --- a/sources/main.c +++ b/sources/main.c @@ -466,17 +466,16 @@ int main( int argc, const char **argv ) db_http_add_proc( DAP_HTTP( l_server ) , DB_URL ); db_http_file_proc_add( DAP_HTTP( l_server ) , DB_FILE_URL ); + // Load all chain networks + dap_chain_net_load_all(); if (dap_config_get_item_bool_default( g_config, "cdb", "servers_list_enabled", false)) { dap_chain_net_srv_vpn_cdb_server_list_add_proc ( DAP_HTTP(l_server), SLIST_URL); } - } - // Load all chain networks - dap_chain_net_load_all(); // Endless loop for server's requests processing rc = dap_server_loop(l_server);