diff --git a/.gitmodules b/.gitmodules index 22f3b2ec02e333e7f63ece13d6365893bf412000..ae717dad8752c32c98386f2bdf727706f59070d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "test/libdap-test"] path = test/libdap-test - url = https://gitlab.demlabs.net/cellframe/libdap-test.git + url = ../../libdap-test.git branch = master [submodule "python-cellframe"] path = python-cellframe - url = https://gitlab.demlabs.net/cellframe/python-cellframe.git + url = ../../python-cellframe.git [submodule "cellframe-sdk"] path = cellframe-sdk - url = https://gitlab.demlabs.net/cellframe/cellframe-sdk.git - branch = master \ No newline at end of file + url = ../../cellframe/cellframe-sdk.git + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index 85c195c1cb39d414dac7cb4e3a3e5b18b996fbd1..ae123ac5fd2c6b3ec0f11618cd936e8e7212fe42 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 2) SET( CPACK_PACKAGE_VERSION_MINOR 2) -SET( CPACK_PACKAGE_VERSION_PATCH 1) +SET( CPACK_PACKAGE_VERSION_PATCH 2) # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") @@ -16,9 +16,9 @@ set(SUBMODULES_NO_BUILD ON) set(SUPPORT_PYTHON_PLUGINS ON) if (NOT(WIN32)) - set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-vpn srv-stake srv-xchange") + set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn") else() - set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange") + set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic") endif() include (cellframe-sdk/cmake/OS_Detection.cmake) diff --git a/cellframe-sdk b/cellframe-sdk index 4c8db1685f34338090a24f5e97f1afd669ae83bd..139a298a2ec138a687513f09bf24650df58cc13f 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 4c8db1685f34338090a24f5e97f1afd669ae83bd +Subproject commit 139a298a2ec138a687513f09bf24650df58cc13f diff --git a/sources/main.c b/sources/main.c index 3f7cdcd0b25de761415777c22baa28146e3d127d..a21acd29e52baf4de2511ccc150e45a348b3eb10 100755 --- a/sources/main.c +++ b/sources/main.c @@ -406,13 +406,21 @@ int main( int argc, const char **argv ) // Init HTTP-specific values dap_http_new( l_server, dap_get_appname() ); + if( dap_config_get_item_bool_default(g_config,"cdb","enabled",false) ) { + if(dap_modules_dynamic_load_cdb(DAP_HTTP( l_server ))){ + log_it(L_CRITICAL,"Can't init CDB module"); + return -3; + }else{ + log_it(L_NOTICE, "Central DataBase (CDB) is initialized"); + } + } // Handshake URL enc_http_add_proc( DAP_HTTP(l_server), ENC_HTTP_URL ); // Streaming URLs dap_stream_add_proc_http( DAP_HTTP(l_server), STREAM_URL ); dap_stream_ctl_add_proc( DAP_HTTP(l_server), STREAM_CTL_URL ); - +/* // BugReport URLs bool l_bugreport_url_enabled = dap_config_get_item_bool_default(g_config, "server", "bugreport_url_enabled", false); if(l_bugreport_url_enabled) { @@ -423,7 +431,7 @@ int main( int argc, const char **argv ) bool l_news_url_enabled = dap_config_get_item_bool_default(g_config, "server", "news_url_enabled", false); if(l_news_url_enabled) { dap_chain_net_news_add_proc(DAP_HTTP(l_server)); - } + }*/ const char *str_start_mempool = dap_config_get_item_str( g_config, "mempool", "accept" ); if ( str_start_mempool && !strcmp(str_start_mempool, "true")) { @@ -461,20 +469,6 @@ int main( int argc, const char **argv ) log_it(L_ERROR, "Can't provide exchange capability"); } -#ifdef DAP_OS_LINUX -#ifndef __ANDROID__ - // If CDB module switched on - if( dap_config_get_item_bool_default(g_config,"cdb","enabled",false) ) { - if ( (rc=dap_chain_net_srv_vpn_cdb_init(DAP_HTTP( l_server ))) != 0 ){ - log_it(L_CRITICAL,"Can't init CDB module, return code %d",rc); - return -3; - - } - log_it(L_NOTICE, "Central DataBase (CDB) is initialized"); - } -#endif -#endif - if (bServerEnabled) { // Endless loop for server's requests processing rc = dap_server_loop(l_server);