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 28)
+SET( CPACK_PACKAGE_VERSION_PATCH 31)
 
 # init CellFrame SDK
 add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
@@ -25,11 +25,11 @@ endif()
 
 
 if (WIN32)
-    set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic")
+    set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
 elseif(BSD)
-    set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic")
+    set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
 elseif(DARWIN)
-    set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic")
+    set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
 elseif(ANDROID)
     set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
 elseif(LINUX)

cellframe-sdk @ a27db464

-Subproject commit e36fc955be3cf2f5a05148720868c057df13faa8
+Subproject commit a27db464f08e151be031ff805d030bbf969fc26d

sources/main.c

@@ -61,8 +61,10 @@
 #include "dap_http_folder.h"
 #include "dap_chain_node_dns_client.h"
 #include "dap_chain_node_dns_server.h"
-#include "dap_modules_dynamic_cdb.h"
 
+#ifdef DAP_MODULES_DYNAMIC
+#include "dap_modules_dynamic_cdb.h"
+#endif
 
 #include "dap_events.h"
 #include "dap_enc.h"
@@ -86,8 +88,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
 
@@ -439,6 +439,7 @@ int main( int argc, const char **argv )
             // Init HTTP-specific values
             dap_http_new( l_server, dap_get_appname() );
 
+#ifdef DAP_MODULES_DYNAMIC
             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");
@@ -447,6 +448,7 @@ int main( int argc, const char **argv )
                     log_it(L_NOTICE, "Central DataBase (CDB) is initialized");
                 }
             }
+#endif
 
 	        // Handshake URL
 	        enc_http_add_proc( DAP_HTTP(l_server), ENC_HTTP_URL );
@@ -483,13 +485,8 @@ int main( int argc, const char **argv )
         }
     }
 
-
-
-
     //dap_chain_net_load_all();
 
-
-
     //Init python plugins
     #ifdef DAP_SUPPORT_PYTHON_PLUGINS
         log_it(L_NOTICE, "Loading python plugins");
@@ -517,6 +514,10 @@ int main( int argc, const char **argv )
     dap_chain_net_srv_xchange_deinit();
     dap_chain_net_srv_stake_deinit();
     dap_chain_net_deinit();
+
+#ifdef DAP_MODULES_DYNAMIC
+    dap_modules_dynamic_close_cdb();
+#endif
     dap_chain_global_db_deinit();
     dap_chain_deinit();
 	dap_config_close( g_config );

sources/sig_unix_handler.c

@@ -17,6 +17,9 @@
 #include "dap_http.h"
 #include "dap_chain_node_dns_server.h"
 #include "sig_unix_handler.h"
+#ifdef DAP_MODULES_DYNAMIC
+#include "dap_modules_dynamic_cdb.h"
+#endif
 
 #define LOG_TAG "sig_unix_handler"
 
@@ -49,6 +52,9 @@ static void sig_exit_handler(int sig_code) {
     dap_enc_ks_deinit();
     enc_http_deinit();
     dap_http_deinit();
+#ifdef DAP_MODULES_DYNAMIC
+    dap_modules_dynamic_close_cdb();
+#endif
     dap_dns_server_stop();
     dap_server_deinit();
     dap_events_stop_all();