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

[*] Renames, reworks, merges with latest changes

parent c4ea0055
No related branches found
No related tags found
No related merge requests found
Subproject commit 79ded4d53655389b65aadc2d64cca483fd30acf2
Subproject commit 1ab50a30567758e0ab911b835fcb026544b8b4f3
Subproject commit 2342392e0c16ddafe12178ddbc82df6c3bd939c7
Subproject commit eb8d6879948d9b34e87131b4bbd3f9ea33fefb05
Subproject commit 743f232bb89c145a665870a89f431998e6c8bf61
Subproject commit 663e041856e718861b5b2f2903d027a94fb1e794
Subproject commit 08a30d1a7dce5a13abf76f429289d60ba199ba10
Subproject commit 1bdbf4e4d6282cd8ad20cc99a7eb3aaa631ad683
Subproject commit a441f76ca365d8a545448d2a656481e724078d33
Subproject commit a6ee421c6979f3dcb77c787100bda1c6f0d8e8f9
Subproject commit 8050588b083310ae80e28eece638356370c7ec6f
Subproject commit eff2e13278b8b87b9f42be7c1648f2d20f5f024e
Subproject commit a071181d11171f014856dfa28b7a662b1f654629
Subproject commit 7bdaeb20e3e311c5ab09b6ef3e5dda56d3694f1b
Subproject commit c434090b03c59d737d557abbbb9b573791d0e8a8
Subproject commit a15f8177170e17453b587287b8249ca100735c01
Subproject commit 458d4e55fe3b7078756864e6cca6bab43e179860
Subproject commit 643d905d3e930746b2df3126e16ef5aaa6502cd8
Subproject commit b4277640bf615ac1694f2d15195174f2c1c276d1
Subproject commit 6c20c706f6790081007fe9600b88435bf5be62ed
......@@ -39,9 +39,9 @@
#include "dap_chain_net_srv_vpn.h"
#include "stream_session.h"
#include "stream.h"
#include "stream_ctl.h"
#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"
......@@ -122,7 +122,7 @@ int main(int argc, const char * argv[])
return -56;
}
if(dap_enc_ks_init() !=0){
if(dap_enc_ks_init(false, 60*60*2 ) !=0){
log_it(L_CRITICAL,"Can't init encryption key storage module");
return -57;
}
......@@ -230,12 +230,12 @@ int main(int argc, const char * argv[])
return -81;
}
if(stream_init() != 0 ){
if(dap_stream_init() != 0 ){
log_it(L_CRITICAL,"Can't init stream server module");
return -82;
}
if (stream_ctl_init() != 0 ){
if (dap_stream_ctl_init() != 0 ){
log_it(L_CRITICAL,"Can't init stream control module");
return -83;
}
......@@ -300,8 +300,8 @@ int main(int argc, const char * argv[])
enc_http_add_proc(DAP_HTTP(l_server), ENC_HTTP_URL);
// Streaming URLs
stream_add_proc_http(DAP_HTTP(l_server), STREAM_URL);
stream_ctl_add_proc(DAP_HTTP(l_server), STREAM_CTL_URL);
dap_stream_add_proc_http(DAP_HTTP(l_server), STREAM_URL);
dap_stream_ctl_add_proc(DAP_HTTP(l_server), STREAM_CTL_URL);
// Built in WWW server
......@@ -339,8 +339,8 @@ int main(int argc, const char * argv[])
if (dap_config_get_item_bool_default(g_config,"vpn","enabled",false))
dap_stream_ch_vpn_deinit();
stream_deinit();
stream_ctl_deinit();
dap_stream_deinit();
dap_stream_ctl_deinit();
dap_http_folder_deinit();
dap_http_deinit();
dap_server_deinit();
......
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