diff --git a/sources/main.c b/sources/main.c index 62eae2d61cceceb1e8ef0de54f4cd1a3c759fdac..b2935ae3e3d43958525f78ceaf539c62bba0a3ca 100644 --- a/sources/main.c +++ b/sources/main.c @@ -82,6 +82,7 @@ #include "dap_chain_net_srv_datum.h" #include "dap_chain_net_srv_datum_pool.h" #include "dap_chain_net_srv_vpn.h" +#include "dap_chain_net_vpn_client.h" #include "dap_chain_global_db.h" #include "dap_chain_mempool.h" #include "dap_chain_node_cli.h" @@ -276,7 +277,6 @@ int main( int argc, const char **argv ) return -66; } -#if 0 if( dap_chain_net_srv_app_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network service applications module"); return -67; @@ -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"); return -69; } - 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 server + if(dap_config_get_item_bool_default(g_config, "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; + } + } + // 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 ) { log_it( L_CRITICAL, "Can't init encryption http session storage module" ); diff --git a/sources/main_node_cli.c b/sources/main_node_cli.c index 61cb018bafac28459e26f464c91251cdf07e1a5d..919f2a4758742de7c222faa4517c4a7c40343ac0 100644 --- a/sources/main_node_cli.c +++ b/sources/main_node_cli.c @@ -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); 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); } @@ -205,7 +205,7 @@ int main(int argc, const char * argv[]) cparam = node_cli_connect(); if(!cparam) { - printf("Can't connected to kelvin-node\n"); + printf("Can't connected to " DAP_APP_NAME "\n"); exit(-1); }