diff --git a/CMakeLists.txt b/CMakeLists.txt index fc7a85252af7f001dc0786f2bc983a9465ecd9f5..8305bd43105ad6d10bd5e72f5754e6e578041870 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 6) -SET( CPACK_PACKAGE_VERSION_PATCH 7) +SET( CPACK_PACKAGE_VERSION_PATCH 8) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl index 57f30cd4bcf7a8a4251008027fd43156fd7204b4..dd9f78881ec47942576c1259143ac0ae8a7f0a5b 100644 --- a/dist/share/configs/cellframe-node.cfg.tpl +++ b/dist/share/configs/cellframe-node.cfg.tpl @@ -43,6 +43,12 @@ access_groups=expats,services,admins network_address=10.11.12.0 network_mask=255.255.255.0 +# old VPN server +[vpn_old] +enabled=true +network_address=10.11.11.0 +network_mask=255.255.255.0 + # Console interface server [conserver] enabled=true diff --git a/sources/main.c b/sources/main.c index e155887ba80dad63dfa1c17ae10223a8910c2358..dd64d86469f491c45e203677ac9e2d40eae91f22 100644 --- a/sources/main.c +++ b/sources/main.c @@ -300,15 +300,14 @@ int main( int argc, const char **argv ) log_it(L_CRITICAL,"Can't init dap chain network service datum pool module"); return -69; } - // vpn server #ifndef _WIN32 - /* + // vpn server if(dap_config_get_item_bool_default(g_config, "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"); @@ -423,11 +422,9 @@ int main( int argc, const char **argv ) // VPN channel - - - if (dap_config_get_item_bool_default(g_config,"vpn","enabled",false)){ - dap_stream_ch_vpn_init(dap_config_get_item_str_default(g_config, "vpn", "network_address", NULL), - dap_config_get_item_str_default(g_config, "vpn", "network_mask", NULL)); + if(dap_config_get_item_bool_default(g_config,"vpn_old","enabled",false)){ + dap_stream_ch_vpn_init(dap_config_get_item_str_default(g_config, "vpn_old", "network_address", NULL), + dap_config_get_item_str_default(g_config, "vpn_old", "network_mask", NULL)); }