From 0f903533677dd4d1342a982a237b0228e5c412f2 Mon Sep 17 00:00:00 2001
From: "aleksei.voronin" <aleksei.voronin@demlabs.net>
Date: Mon, 25 May 2020 14:41:41 +0300
Subject: [PATCH] [*] fixed bug when node didn't work if vpn service is enabled
---
CMakeLists.txt | 2 +-
cellframe-sdk | 2 +-
sources/main.c | 30 +++++++++++++++---------------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dab721..8296d64 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 0)
-SET( CPACK_PACKAGE_VERSION_PATCH 2)
+SET( CPACK_PACKAGE_VERSION_PATCH 3)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
diff --git a/cellframe-sdk b/cellframe-sdk
index 7408872..d27598e 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit 7408872c958c0448e38538d645e5c6e29dea1a5c
+Subproject commit d27598edc2acf65938983fb8e5dd38b7e75cc677
diff --git a/sources/main.c b/sources/main.c
index e342103..72eb212 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -293,21 +293,6 @@ int main( int argc, const char **argv )
return -66;
}
-#ifndef _WIN32
- // vpn server
- if(dap_config_get_item_bool_default(g_config, "srv_vpn", "enabled", false)) {
- if(dap_chain_net_srv_vpn_init(g_config) != 0) {
- log_it(L_ERROR, "Can't init dap chain network service vpn module");
- return -70;
- }
- }
- // vpn client
- if(dap_chain_net_vpn_client_init(g_config) != 0) {
- log_it(L_ERROR, "Can't init dap chain network service vpn client");
- return -71;
- }
-#endif
-
if ( enc_http_init() != 0 ) {
log_it( L_CRITICAL, "Can't init encryption http session storage module" );
@@ -413,6 +398,21 @@ int main( int argc, const char **argv )
dap_events_t *l_events = dap_events_new( );
dap_events_start( l_events );
+#ifndef _WIN32
+ // vpn server
+ if(dap_config_get_item_bool_default(g_config, "srv_vpn", "enabled", false)) {
+ if(dap_chain_net_srv_vpn_init(g_config) != 0) {
+ log_it(L_ERROR, "Can't init dap chain network service vpn module");
+ return -70;
+ }
+ }
+ // vpn client
+ if(dap_chain_net_vpn_client_init(g_config) != 0) {
+ log_it(L_ERROR, "Can't init dap chain network service vpn client");
+ return -71;
+ }
+#endif
+
//dap_chain_net_load_all();
#ifdef DAP_OS_LINUX
--
GitLab