Skip to content
Snippets Groups Projects
Commit 9bed033b authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

[*] New chain net service proto

[*] Other updateds
[-] Useless submodules removed
parent 06f3622a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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 15)
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,7 +165,6 @@ 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-chain-net)
add_subdirectory(libdap-stream-ch-chain-net-srv)
......
Subproject commit dd5def6c3f1321683014a06a66936fb92b94ea38
Subproject commit 483286aa342741bc1cce8f10a880891faec1b01c
Subproject commit 05aba3a3fe2c3eec25aa69b7bc581c2484369f03
Subproject commit 85dc96c77b8f1aef5a256bb8d375935dc9db70c1
Subproject commit 76181225215f91f3a2a42671f735f70ade46d045
Subproject commit c5a7111b857d5784c33a9aaeb6abbe69d9bdf6a5
Subproject commit 8c6bbf4458bd10614bf48bb2da7e84b4f80f0d33
Subproject commit 4449476079faf4ab3180eed488edc4883c385a50
Subproject commit 491c088b2020242747f478ae7db183934c0777f5
Subproject commit 95108040ee58ffdab6378aff52c59d4fb27caa59
Subproject commit 620d2eff0406ff4202d5bfb7b79c2ce3752bad84
Subproject commit 04e23e07662555083adf19059732bf9768e28f6e
Subproject commit 1ae33a38297c2c9aa77a691ff0b642d2650199d3
Subproject commit 8186a9c5d8e45a39b8e91a41e2cf668e7189d612
Subproject commit 84e0d96f6301339572b62c363b5d46feab354521
Subproject commit 270768f0b85a96eba3578bd0ffe3cf25ac76dc5a
Subproject commit 0c96cf2c10c9d2812a90d4bb7d45ba721c602e87
Subproject commit 68ebab00ae1544c4854c3c919472dab935b856fc
......@@ -294,7 +294,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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment