From 04cef3ccea128966d6b646f9a8a1ad2c037fb620 Mon Sep 17 00:00:00 2001
From: Dmitry Gerasimov <dmitriy.gerasimov@demlabs.net>
Date: Wed, 29 Jun 2022 15:36:47 +0700
Subject: [PATCH] [+] Added VPN support for Darwin
---
CMakeLists.txt | 4 ++--
cellframe-sdk | 2 +-
sources/main.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6afc507d3..f457f671d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,9 +45,9 @@ if(LINUX)
set(SUPPORT_PYTHON_PLUGINS ON)
endif()
-if(LINUX)
+if(LINUX OR DARWIN)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
-elseif(WIN32 OR BSD OR DARWIN OR ANDROID)
+elseif(WIN32 OR BSD OR ANDROID)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
endif()
diff --git a/cellframe-sdk b/cellframe-sdk
index e08d71063..827470b96 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit e08d71063338ad400716dfab7c3f3ddc66113d0f
+Subproject commit 827470b96e055085e5d5456a9549ce5098c7bad5
diff --git a/sources/main.c b/sources/main.c
index 838793aaf..d1cdef054 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -93,7 +93,7 @@
#include "dap_chain_net_srv_datum.h"
#include "dap_chain_net_srv_geoip.h"
-#ifdef DAP_OS_LINUX
+#if defined(DAP_OS_DARWIN) || ( defined(DAP_OS_LINUX) && ! defined (DAP_OS_ANDROID))
#include "dap_chain_net_srv_vpn.h"
#include "dap_chain_net_vpn_client.h"
#endif
@@ -391,7 +391,7 @@ int main( int argc, const char **argv )
}
-#if defined(DAP_OS_LINUX) && ! defined (DAP_OS_ANDROID)
+#if defined(DAP_OS_DARWIN) || ( defined(DAP_OS_LINUX) && ! defined (DAP_OS_ANDROID))
// 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) {
--
GitLab