Skip to content
Snippets Groups Projects
Commit 1ac4e74a authored by alexander.lysikov's avatar alexander.lysikov
Browse files

added launch of vpn client

parent f264f387
1 merge request!36Feature 2557n2
This commit is part of merge request !36. Comments created here will be created in the context of that merge request.
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
#include "dap_chain_net_srv_datum.h" #include "dap_chain_net_srv_datum.h"
#include "dap_chain_net_srv_datum_pool.h" #include "dap_chain_net_srv_datum_pool.h"
#include "dap_chain_net_srv_vpn.h" #include "dap_chain_net_srv_vpn.h"
#include "dap_chain_net_vpn_client.h"
#include "dap_chain_global_db.h" #include "dap_chain_global_db.h"
#include "dap_chain_mempool.h" #include "dap_chain_mempool.h"
#include "dap_chain_node_cli.h" #include "dap_chain_node_cli.h"
...@@ -276,7 +277,6 @@ int main( int argc, const char **argv ) ...@@ -276,7 +277,6 @@ int main( int argc, const char **argv )
return -66; return -66;
} }
#if 0
if( dap_chain_net_srv_app_init() !=0){ if( dap_chain_net_srv_app_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain network service applications module"); log_it(L_CRITICAL,"Can't init dap chain network service applications module");
return -67; return -67;
...@@ -291,11 +291,18 @@ int main( int argc, const char **argv ) ...@@ -291,11 +291,18 @@ int main( int argc, const char **argv )
log_it(L_CRITICAL,"Can't init dap chain network service datum pool module"); log_it(L_CRITICAL,"Can't init dap chain network service datum pool module");
return -69; return -69;
} }
if( dap_chain_net_srv_vpn_init(g_config) !=0){ // vpn server
log_it(L_ERROR,"Can't init dap chain network service vpn module"); if(dap_config_get_item_bool_default(g_config, "vpn", "enabled", false)) {
//return -70; 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");
return -71;
} }
#endif
if ( enc_http_init() != 0 ) { if ( enc_http_init() != 0 ) {
log_it( L_CRITICAL, "Can't init encryption http session storage module" ); log_it( L_CRITICAL, "Can't init encryption http session storage module" );
......
...@@ -197,7 +197,7 @@ int main(int argc, const char * argv[]) ...@@ -197,7 +197,7 @@ int main(int argc, const char * argv[])
memset(s_sys_dir_path + l_sys_dir_path_len, '\0', MAX_PATH - l_sys_dir_path_len); memset(s_sys_dir_path + l_sys_dir_path_len, '\0', MAX_PATH - l_sys_dir_path_len);
if((g_config = dap_config_open(DAP_APP_NAME)) == NULL) { if((g_config = dap_config_open(DAP_APP_NAME)) == NULL) {
printf("Can't init general configurations\n"); printf("Can't init general configurations " DAP_APP_NAME ".cfg\n");
exit(-1); exit(-1);
} }
...@@ -205,7 +205,7 @@ int main(int argc, const char * argv[]) ...@@ -205,7 +205,7 @@ int main(int argc, const char * argv[])
cparam = node_cli_connect(); cparam = node_cli_connect();
if(!cparam) if(!cparam)
{ {
printf("Can't connected to kelvin-node\n"); printf("Can't connected to " DAP_APP_NAME "\n");
exit(-1); exit(-1);
} }
......
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