From d68677e4ee793f846124701d1ee84d604786f22d Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Wed, 16 Oct 2019 15:08:14 +0300
Subject: [PATCH] various fixes, version up
---
CMakeLists.txt | 2 +-
libdap | 2 +-
libdap-chain | 2 +-
libdap-chain-net | 2 +-
libdap-chain-wallet | 2 +-
libdap-client | 2 +-
libdap-server | 2 +-
libdap-server-core | 2 +-
sources/main.c | 4 --
sources/main_node_tool.c | 80 +++++++++++++++++-----------------------
10 files changed, 41 insertions(+), 59 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60fcd1b29..9ea89191f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ SET( CPACK_GENERATOR "DEB")
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 2)
SET( CPACK_PACKAGE_VERSION_MINOR 4)
-SET( CPACK_PACKAGE_VERSION_PATCH 6)
+SET( CPACK_PACKAGE_VERSION_PATCH 9)
SET( CPACK_SYSTEM_NAME "debian-9.9-amd64")
SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
diff --git a/libdap b/libdap
index 4245f95d7..836978349 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 4245f95d7119b13a14ceb76310a35f59489593af
+Subproject commit 836978349e2af4da10f403fb2809717de1ddda35
diff --git a/libdap-chain b/libdap-chain
index bf6609ff3..5dda118b6 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit bf6609ff3a05592c6f08ea1951790478beee9192
+Subproject commit 5dda118b69388dff4c88264e4ce4c44b520119c6
diff --git a/libdap-chain-net b/libdap-chain-net
index 5dd96ec74..504a7dd33 160000
--- a/libdap-chain-net
+++ b/libdap-chain-net
@@ -1 +1 @@
-Subproject commit 5dd96ec746ee43ca3b7aef396e51806d68359d74
+Subproject commit 504a7dd3397b0420ea3acf9c24ceb6784fa94e44
diff --git a/libdap-chain-wallet b/libdap-chain-wallet
index 591dacd12..08d36df68 160000
--- a/libdap-chain-wallet
+++ b/libdap-chain-wallet
@@ -1 +1 @@
-Subproject commit 591dacd12b0c101b466024ba845a7b00891f84c0
+Subproject commit 08d36df686d5103db0726d93f22cc5960d9dab0a
diff --git a/libdap-client b/libdap-client
index 9f47ebe9e..66901d7bf 160000
--- a/libdap-client
+++ b/libdap-client
@@ -1 +1 @@
-Subproject commit 9f47ebe9e7b1f326800a5ddde661a3e30a4381c2
+Subproject commit 66901d7bfddbcba7d420c5729b42e9f424b721fa
diff --git a/libdap-server b/libdap-server
index fdcfd4fe6..e691af793 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit fdcfd4fe6727f4d4151affef761007c95d5a36eb
+Subproject commit e691af79399d8905bdf3d04a106acf4ef94e35b5
diff --git a/libdap-server-core b/libdap-server-core
index 73dfe6c26..19e2f7803 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit 73dfe6c2616ef8a805231560051de3c407d7cd89
+Subproject commit 19e2f780392092e36c1bb3fb277c259d9d8c5160
diff --git a/sources/main.c b/sources/main.c
index 62eae2d61..8cc2857c6 100644
--- a/sources/main.c
+++ b/sources/main.c
@@ -114,10 +114,6 @@
#define MEMPOOL_URL "/mempool"
#define MAIN_URL "/"
-#ifndef MAX_PATH
-#define MAX_PATH 120
-#endif
-
void parse_args( int argc, const char **argv );
void exit_if_server_already_running( void );
diff --git a/sources/main_node_tool.c b/sources/main_node_tool.c
index cb2f1b663..b4daca59a 100644
--- a/sources/main_node_tool.c
+++ b/sources/main_node_tool.c
@@ -85,33 +85,11 @@
#include "dap_client.h"
#include "dap_http_simple.h"
#include "dap_process_manager.h"
+#include "dap_defines.h"
#ifdef _WIN32
#include "registry.h"
#endif
#define DAP_APP_NAME NODE_NETNAME "-node"
-#ifdef _WIN32
- #define SYSTEM_PREFIX "opt/"DAP_APP_NAME
-#else
- #define SYSTEM_PREFIX "/opt/"DAP_APP_NAME
-#define MAX_PATH 260
-#endif
-
-#define LOCAL_PREFIX "~/."DAP_APP_NAME
-
-#define SYSTEM_CONFIGS_DIR SYSTEM_PREFIX"/etc"
-#define LOCAL_CONFIGS_DIR LOCAL_PREFIX"/etc"
-
-#define SYSTEM_CA_DIR SYSTEM_PREFIX"/var/lib/ca"
-#define LOCAL_CA_DIR LOCAL_PREFIX"/ca"
-
-#define SYSTEM_WALLET_DIR SYSTEM_PREFIX"/var/lib/wallet"
-#define LOCAL_WALLET_DIR LOCAL_PREFIX"/wallet"
-
-#define SYSTEM_CONFIG_GLOBAL_FILENAME SYSTEM_PREFIX"/etc/"DAP_APP_NAME".cfg"
-#define LOCAL_CONFIG_GLOBAL LOCAL_PREFIX"/etc/"DAP_APP_NAME".cfg"
-
-#define SYSTEM_PID_FILE_PATH SYSTEM_PREFIX"/run/"DAP_APP_NAME".pid"
-#define LOCAL_PID_FILE_PATH SYSTEM_PREFIX"/run/"DAP_APP_NAME".pid"
#define ENC_HTTP_URL "/enc_init"
#define STREAM_CTL_URL "/stream_ctl"
@@ -124,11 +102,9 @@ static int s_init( int argc, const char * argv[] );
static void s_help( );
static char s_system_ca_dir[MAX_PATH];
-static const char *s_appname = "kelvin-node-tool";
+static const char *s_appname = "cellframe-node-tool";
-int main( int argc, const char **argv )
-{
- uint8_t *buff = (uint8_t *)malloc( 8192 );
+int main(int argc, const char **argv) {
int ret = s_init( argc, argv );
if ( ret ) {
@@ -175,12 +151,11 @@ int main( int argc, const char **argv )
s_help( );
exit( -2004 );
}
- char l_wallets_path[MAX_PATH];
+ char l_wallets_path[MAX_PATH] = {'\0'};
#ifdef _WIN32
- dap_sprintf(l_wallets_path, "%s\\%s\\%s", regGetUsrPath(), DAP_APP_NAME, SYSTEM_WALLET_DIR);
-#else
- dap_stpcpy(l_wallets_path, SYSTEM_WALLET_DIR);
+ dap_stpcpy(l_wallets_path, s_sys_dir_path);
#endif
+ dap_sprintf(l_wallets_path + l_sys_dir_path_len, "%s", dap_config_get_item_str(g_config, "resources", "wallets_path"));
l_wallet = dap_chain_wallet_create( l_wallet_name, l_wallets_path, l_network_id, l_sig_type );
}
else if ( strcmp( argv[2],"sign_file") == 0 ) {
@@ -191,12 +166,11 @@ int main( int argc, const char **argv )
s_help();
exit(-3000);
}
- char l_wallets_path[MAX_PATH];
+ char l_wallets_path[MAX_PATH] = {'\0'};
#ifdef _WIN32
- dap_sprintf(l_wallets_path, "%s\\%s\\%s", regGetUsrPath(), DAP_APP_NAME, SYSTEM_WALLET_DIR);
-#else
- dap_stpcpy(l_wallets_path, SYSTEM_WALLET_DIR);
+ dap_stpcpy(l_wallets_path, s_sys_dir_path);
#endif
+ dap_sprintf(l_wallets_path + l_sys_dir_path_len, "%s", dap_config_get_item_str(g_config, "resources", "wallets_path"));
dap_chain_wallet_t *l_wallet = dap_chain_wallet_open( argv[3], l_wallets_path);
if ( !l_wallet ) {
log_it(L_ERROR,"Can't open wallet \"%s\"",argv[3]);
@@ -385,19 +359,28 @@ int main( int argc, const char **argv )
*/
static int s_init( int argc, const char **argv )
{
- if ( dap_common_init( DAP_APP_NAME, DAP_APP_NAME"_logs.txt") != 0 ) {
- printf( "Fatal Error: Can't init common functions module" );
- return -2;
- }
+ char l_log_file_path[MAX_PATH];
+ l_sys_dir_path_len = 0;
#ifdef _WIN32
- dap_sprintf(s_sys_dir_path, "%s/%s", regGetUsrPath(), DAP_APP_NAME);
- l_sys_dir_path_len = strlen(s_sys_dir_path);
- memcpy(s_system_ca_dir, s_sys_dir_path, l_sys_dir_path_len);
+ dap_sprintf(s_sys_dir_path, "%s/%s", regGetUsrPath(), DAP_APP_NAME);
+ l_sys_dir_path_len = strlen(s_sys_dir_path);
+ memcpy(s_system_ca_dir, s_sys_dir_path, l_sys_dir_path_len);
+ memcpy(l_log_file_path, s_sys_dir_path, l_sys_dir_path_len);
#endif
- memcpy( s_sys_dir_path + l_sys_dir_path_len, SYSTEM_CONFIGS_DIR, sizeof(SYSTEM_CONFIGS_DIR) );
+ memcpy(l_log_file_path + l_sys_dir_path_len, SYSTEM_LOGS_DIR, sizeof(SYSTEM_LOGS_DIR));
+ dap_sprintf(l_log_file_path + l_sys_dir_path_len + sizeof(SYSTEM_LOGS_DIR) - 1, "/%s_tool_logs.txt", DAP_APP_NAME);
+
+ if (dap_common_init(DAP_APP_NAME, l_log_file_path) != 0) {
+ printf("Fatal Error: Can't init common functions module");
+ return -2;
+ }
+
+ memcpy(s_sys_dir_path + l_sys_dir_path_len, SYSTEM_CONFIGS_DIR, sizeof(SYSTEM_CONFIGS_DIR));
dap_config_init( s_sys_dir_path );
memset(s_sys_dir_path + l_sys_dir_path_len, '\0', MAX_PATH - l_sys_dir_path_len);
- dap_sprintf(s_system_ca_dir + l_sys_dir_path_len, "%s", SYSTEM_CA_DIR);
+
+ //dap_sprintf(s_system_ca_dir + l_sys_dir_path_len, "%s", l_ca_folders[i]);
+
if ( (g_config = dap_config_open(DAP_APP_NAME)) == NULL ) {
log_it( L_ERROR, "Can't init general configurations" );
return -1;
@@ -418,7 +401,7 @@ static int s_init( int argc, const char **argv )
return -5;
}
- if ( dap_server_init(0) != 0 ) {
+ /* if ( dap_server_init(0) != 0 ) {
log_it( L_ERROR, "Can't server module" );
return -6;
}
@@ -451,9 +434,12 @@ static int s_init( int argc, const char **argv )
if ( dap_client_init() != 0 ) {
log_it( L_ERROR, "Can't chain wallet storage module" );
return -12;
- }
+ } */
- return 0;
+ uint16_t l_ca_folders_size = 0;
+ char **l_ca_folders = dap_config_get_array_str(g_config, "resources", "ca_folders", &l_ca_folders_size);
+ memcpy(s_system_ca_dir + l_sys_dir_path_len, l_ca_folders[0], strlen(l_ca_folders[0]));
+ return 0;
}
/**
--
GitLab