diff --git a/.gitmodules b/.gitmodules
index 37a56b62424537cca94c0a906df27a1f879fa535..89dd574069c9e1cedd460757bf665abdce78c613 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,18 +14,6 @@
path = libdap-stream
url = https://gitlab.demlabs.net/cellframe/libdap-stream.git
branch = master
-[submodule "libdap-stream-ch-vpn"]
- path = libdap-stream-ch-vpn
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-vpn.git
- branch = master
-[submodule "libdap-stream-ch-av"]
- path = libdap-stream-ch-av
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-av.git
- branch = master
-[submodule "libdap-stream-ch-chat"]
- path = libdap-stream-ch-chat
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chat.git
- branch = master
[submodule "libdap-server-core"]
path = libdap-server-core
url = https://gitlab.demlabs.net/cellframe/libdap-server-core.git
@@ -34,6 +22,10 @@
path = libdap-stream-ch-chain
url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chain.git
branch = master
+[submodule "libdap-stream-ch-chat"]
+ path = libdap-stream-ch-chat
+ url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chat.git
+ branch = master
[submodule "libdap-chain-net"]
path = libdap-chain-net
url = https://gitlab.demlabs.net/cellframe/libdap-chain-net.git
@@ -122,14 +114,6 @@
path = libdap-crypto
url = https://gitlab.demlabs.net/cellframe/libdap-crypto.git
branch = master
-[submodule "libdap-stream-ch-iot"]
- path = libdap-stream-ch-iot
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-iot.git
- branch = master
-[submodule "libdap-iot"]
- path = libdap-iot
- url = https://gitlab.demlabs.net/cellframe/libdap-iot.git
- branch = master
[submodule "test/libdap-test"]
path = test/libdap-test
url = https://gitlab.demlabs.net/cellframe/libdap-test.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85bdb6e315c188eb24829ed714e422a127c3728e..ed63026eb4b6211e0be7bac7521bae0a63c2187e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,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 14)
+SET( CPACK_PACKAGE_VERSION_PATCH 17)
SET( CPACK_SYSTEM_NAME "debian-9.9-amd64")
SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
@@ -165,8 +165,8 @@ add_subdirectory(libdap-stream)
add_subdirectory(libdap-stream-ch)
add_subdirectory(libdap-client)
-add_subdirectory(libdap-stream-ch-vpn)
add_subdirectory(libdap-stream-ch-chain)
+#add_subdirectory(libdap-stream-ch-chat)
add_subdirectory(libdap-stream-ch-chain-net)
add_subdirectory(libdap-stream-ch-chain-net-srv)
@@ -222,7 +222,7 @@ if(WIN32)
)
set_property(TARGET ${PROJECT_NAME}-cli APPEND_STRING PROPERTY LINK_FLAGS "-mconsole")
target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net
+ dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db
@@ -263,7 +263,7 @@ if(WIN32)
set_property(TARGET ${PROJECT_NAME}-tool APPEND_STRING PROPERTY LINK_FLAGS "-mconsole")
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net
+ dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db
@@ -311,7 +311,7 @@ endif()
if(UNIX)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net
+ dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db
@@ -324,7 +324,7 @@ if(UNIX)
target_link_libraries(${PROJECT_NAME}-cli m dap_chain_net curl dap_cuttdb )
target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net
+ dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db
diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl
index d593ef08e89b135ab1a162b02cb4afbfb65fe598..e3f3cb9717e43be55bfbd02ea4299ef0f421f6bd 100644
--- a/dist/share/configs/cellframe-node.cfg.tpl
+++ b/dist/share/configs/cellframe-node.cfg.tpl
@@ -45,13 +45,6 @@ enabled=true
network_address=10.11.12.0
network_mask=255.255.255.0
-# old VPN server
-[vpn_old]
-enabled=false
-access_groups=expats,services,admins
-network_address=10.11.11.0
-network_mask=255.255.255.0
-
# Console interface server
[conserver]
enabled=true
diff --git a/libdap b/libdap
index dd5def6c3f1321683014a06a66936fb92b94ea38..483286aa342741bc1cce8f10a880891faec1b01c 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit dd5def6c3f1321683014a06a66936fb92b94ea38
+Subproject commit 483286aa342741bc1cce8f10a880891faec1b01c
diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv
index 620d2eff0406ff4202d5bfb7b79c2ce3752bad84..04e23e07662555083adf19059732bf9768e28f6e 160000
--- a/libdap-chain-net-srv
+++ b/libdap-chain-net-srv
@@ -1 +1 @@
-Subproject commit 620d2eff0406ff4202d5bfb7b79c2ce3752bad84
+Subproject commit 04e23e07662555083adf19059732bf9768e28f6e
diff --git a/libdap-client b/libdap-client
index 1ae33a38297c2c9aa77a691ff0b642d2650199d3..8186a9c5d8e45a39b8e91a41e2cf668e7189d612 160000
--- a/libdap-client
+++ b/libdap-client
@@ -1 +1 @@
-Subproject commit 1ae33a38297c2c9aa77a691ff0b642d2650199d3
+Subproject commit 8186a9c5d8e45a39b8e91a41e2cf668e7189d612
diff --git a/libdap-iot b/libdap-iot
deleted file mode 160000
index d26d949e670f888e185365ea8a40a1d6f4a36e02..0000000000000000000000000000000000000000
--- a/libdap-iot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d26d949e670f888e185365ea8a40a1d6f4a36e02
diff --git a/libdap-stream-ch b/libdap-stream-ch
index 84e0d96f6301339572b62c363b5d46feab354521..270768f0b85a96eba3578bd0ffe3cf25ac76dc5a 160000
--- a/libdap-stream-ch
+++ b/libdap-stream-ch
@@ -1 +1 @@
-Subproject commit 84e0d96f6301339572b62c363b5d46feab354521
+Subproject commit 270768f0b85a96eba3578bd0ffe3cf25ac76dc5a
diff --git a/libdap-stream-ch-av b/libdap-stream-ch-av
deleted file mode 160000
index 89736f8e1bf22bc89d938ab5469e8235187f98db..0000000000000000000000000000000000000000
--- a/libdap-stream-ch-av
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89736f8e1bf22bc89d938ab5469e8235187f98db
diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv
index 0c96cf2c10c9d2812a90d4bb7d45ba721c602e87..68ebab00ae1544c4854c3c919472dab935b856fc 160000
--- a/libdap-stream-ch-chain-net-srv
+++ b/libdap-stream-ch-chain-net-srv
@@ -1 +1 @@
-Subproject commit 0c96cf2c10c9d2812a90d4bb7d45ba721c602e87
+Subproject commit 68ebab00ae1544c4854c3c919472dab935b856fc
diff --git a/libdap-stream-ch-iot b/libdap-stream-ch-iot
deleted file mode 160000
index 0d61d274c60237daa5ddc0c72faa9689fc2c06a7..0000000000000000000000000000000000000000
--- a/libdap-stream-ch-iot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0d61d274c60237daa5ddc0c72faa9689fc2c06a7
diff --git a/libdap-stream-ch-vpn b/libdap-stream-ch-vpn
deleted file mode 160000
index fedae323e8c0c3547dda3c17a20252b51e4b2395..0000000000000000000000000000000000000000
--- a/libdap-stream-ch-vpn
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fedae323e8c0c3547dda3c17a20252b51e4b2395
diff --git a/sources/main.c b/sources/main.c
index c9341b7a4c4b4d9c05ce284f2e9556bdd3934b53..0665052d4549b9fa5232d56801b37c1d4b7489af 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -100,7 +100,6 @@
#include "dap_stream_session.h"
#include "dap_stream.h"
#include "dap_stream_ctl.h"
-#include "dap_stream_ch_vpn.h"
#include "dap_stream_ch_chain.h"
#include "dap_stream_ch_chain_net.h"
#include "dap_stream_ch_chain_net_srv.h"
@@ -293,7 +292,7 @@ int main( int argc, const char **argv )
}
#ifndef _WIN32
// vpn server
- if(dap_config_get_item_bool_default(g_config, "vpn", "enabled", false)) {
+ 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;
@@ -412,13 +411,6 @@ int main( int argc, const char **argv )
log_it( L_INFO, "No enabled server, working in client mode only" );
- // VPN channel
- 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));
-
- }
-
// Chain Network init
dap_stream_ch_chain_init( );
diff --git a/sources/main_node_tool.c b/sources/main_node_tool.c
index a1c6ea807a146322cb6db0c3628a0fcde8c9145e..404b2da0c82ddd7c87a1cdf56f81eee7d20c3326 100644
--- a/sources/main_node_tool.c
+++ b/sources/main_node_tool.c
@@ -74,7 +74,6 @@
#include "dap_stream_session.h"
#include "dap_stream.h"
-#include "dap_stream_ch_vpn.h"
#include "dap_stream_ch_chain.h"
#include "dap_stream_ch_chain_net.h"
#include "dap_stream_ch_chain_net_srv.h"