From 8b97046503228af0bd1b3746c511d01d594361d1 Mon Sep 17 00:00:00 2001
From: Dmtiriy Gerasimov <naeper@demlabs.net>
Date: Sun, 28 Apr 2019 21:47:16 +0700
Subject: [PATCH] [*] node-defaults -> node-alias [*] Small fixes
---
dap_chain_net.c | 26 ++++++++++++++++----------
dap_chain_node_cli_cmd.c | 22 +++++++++++-----------
iputils/ping_common.c | 1 +
3 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/dap_chain_net.c b/dap_chain_net.c
index 2bbe276c7a..4e29fd67f2 100755
--- a/dap_chain_net.c
+++ b/dap_chain_net.c
@@ -51,6 +51,7 @@ typedef struct dap_chain_net_pvt{
pthread_t proc_tid;
pthread_cond_t proc_cond;
dap_chain_node_role_t node_role;
+ uint8_t padding[4];
//dap_client_t client;
dap_chain_node_ctl_t * node;
} dap_chain_net_pvt_t;
@@ -61,14 +62,14 @@ typedef struct dap_chain_net_item{
UT_hash_handle hh;
} dap_chain_net_item_t;
-#define PVT(a) ( (dap_chain_net_pvt_t *) a->pvt )
-#define PVT_S(a) ( (dap_chain_net_pvt_t *) a.pvt )
+#define PVT(a) ( (dap_chain_net_pvt_t *) (void*) a->pvt )
+#define PVT_S(a) ( (dap_chain_net_pvt_t *) (void*) a.pvt )
-dap_chain_net_item_t * s_net_items = NULL;
+static dap_chain_net_item_t * s_net_items = NULL;
-size_t s_net_configs_count = 0;
-pthread_cond_t s_net_proc_loop_cond = PTHREAD_COND_INITIALIZER;
-pthread_mutex_t s_net_proc_loop_mutex = PTHREAD_MUTEX_INITIALIZER;
+static size_t s_net_configs_count = 0;
+static pthread_cond_t s_net_proc_loop_cond = PTHREAD_COND_INITIALIZER;
+static pthread_mutex_t s_net_proc_loop_mutex = PTHREAD_MUTEX_INITIALIZER;
/**
* @brief s_net_proc_thread
@@ -79,7 +80,13 @@ pthread_mutex_t s_net_proc_loop_mutex = PTHREAD_MUTEX_INITIALIZER;
static void * s_net_proc_thread ( void * a_net)
{
dap_chain_net_t * l_net = (dap_chain_net_t *) a_net;
-
+ bool is_looping = true ;
+ while( is_looping ) {
+ pthread_mutex_lock(&s_net_proc_loop_mutex);
+ pthread_cond_wait(&s_net_proc_loop_cond,&s_net_proc_loop_mutex);
+ pthread_mutex_unlock(&s_net_proc_loop_mutex);
+ log_it( L_DEBUG, "Waked up net proc thread");
+ }
return NULL;
}
@@ -179,7 +186,6 @@ void dap_chain_net_delete( dap_chain_net_t * a_net )
*/
int dap_chain_net_init()
{
- return 0;
static dap_config_t *l_cfg=NULL;
if((l_cfg = dap_config_open( "network/default" ) ) == NULL) {
log_it(L_ERROR,"Can't open default network config");
@@ -189,7 +195,7 @@ int dap_chain_net_init()
dap_config_get_item_str(l_cfg , "general" , "id" ),
dap_config_get_item_str(l_cfg , "general" , "name" ),
dap_config_get_item_str(l_cfg , "general" , "node-role" ),
- dap_config_get_item_str(l_cfg , "general" , "node-default" )
+ dap_config_get_item_str(l_cfg , "general" , "node-alias" )
);
// Do specific actions
switch ( PVT( l_net )->node_role.enums ) {
@@ -209,7 +215,7 @@ int dap_chain_net_init()
DAP_DELETE (l_chains_path);
if ( l_chains_dir ){
struct dirent * l_dir_entry;
- while ( l_dir_entry = readdir(l_chains_dir) ){
+ while ( (l_dir_entry = readdir(l_chains_dir) )!= NULL ){
char * l_entry_name = strdup(l_dir_entry->d_name);
l_chains_path_size = strlen(l_net->pub.name)+1+strlen("network")+1+strlen (l_entry_name)-3;
l_chains_path = DAP_NEW_Z_SIZE(char, l_chains_path_size);
diff --git a/dap_chain_node_cli_cmd.c b/dap_chain_node_cli_cmd.c
index 5e52bac48b..2ef72892fc 100755
--- a/dap_chain_node_cli_cmd.c
+++ b/dap_chain_node_cli_cmd.c
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include <errno.h>
#include <assert.h>
+#include <ctype.h>
#include <glib.h>
#include <time.h>
#include <arpa/inet.h>
@@ -64,17 +65,16 @@
static int find_option_val(const char** argv, int arg_start, int arg_end, const char *opt_name, const char **opt_value)
{
int arg_index = arg_start;
- int arg_character, on_or_off, next_arg, i;
- char *arg_string;
+ const char *arg_string;
while(arg_index < arg_end)
{
- arg_string = (char *) argv[arg_index];
+ arg_string = argv[arg_index];
// find opt_name
if(arg_string && opt_name && !strcmp(arg_string, opt_name)) {
// find opt_value
if(opt_value) {
- arg_string = (char *) argv[++arg_index];
+ arg_string = argv[++arg_index];
if(arg_string) {
*opt_value = arg_string;
return arg_index;
@@ -143,9 +143,9 @@ dap_chain_node_addr_t* get_name_by_alias(const char *a_alias)
if(!a_alias)
return NULL;
const char *a_key = a_alias;
- size_t l_addr_out = 0;
- l_addr = (dap_chain_node_addr_t*) dap_chain_global_db_gr_get(a_key, &l_addr_out, GROUP_ALIAS);
- if(l_addr_out != sizeof(dap_chain_node_addr_t)) {
+ size_t l_addr_size = 0;
+ l_addr = (dap_chain_node_addr_t*) (void*) dap_chain_global_db_gr_get(a_key, &l_addr_size, GROUP_ALIAS);
+ if(l_addr_size != sizeof(dap_chain_node_addr_t)) {
// l_addr = DAP_NEW_Z(dap_chain_node_addr_t);
// if(hex2bin((char*) l_addr, (const unsigned char *) addr_str, sizeof(dap_chain_node_addr_t) * 2) == -1) {
DAP_DELETE(l_addr);
@@ -171,12 +171,12 @@ static dap_list_t* get_aliases_by_name(dap_chain_node_addr_t *a_addr)
dap_global_db_obj_t **objs = dap_chain_global_db_gr_load(GROUP_ALIAS, &data_size);
if(!objs || !data_size)
return NULL;
- for(int i = 0; i < data_size; i++) {
- dap_chain_node_addr_t addr_i;
+ for(size_t i = 0; i < data_size; i++) {
+ //dap_chain_node_addr_t addr_i;
dap_global_db_obj_t *obj = objs[i];
if(!obj)
break;
- dap_chain_node_addr_t *l_addr = (dap_chain_node_addr_t*) obj->value;
+ dap_chain_node_addr_t *l_addr = (dap_chain_node_addr_t*) (void*) obj->value;
if(l_addr && obj->value_len == sizeof(dap_chain_node_addr_t) && a_addr->uint64 == l_addr->uint64) {
list_aliases = dap_list_prepend(list_aliases, strdup(obj->key));
}
@@ -1482,7 +1482,7 @@ int com_token_emit ( int argc, const char ** argv, char ** str_reply)
int n = 0;
- char ** l_certs_tmp_ptrs = NULL;
+ char * l_certs_tmp_ptrs = NULL;
char * l_certs_str_dup = strdup( l_certs_str);
char *l_cert_str = strtok_r(l_certs_str_dup, ",",&l_certs_tmp_ptrs);
diff --git a/iputils/ping_common.c b/iputils/ping_common.c
index 15eddebc09..4f84eb4434 100755
--- a/iputils/ping_common.c
+++ b/iputils/ping_common.c
@@ -146,6 +146,7 @@ void usage(void)
"\nFor more details see ping(8).\n"
);
//exit(2);
+ exit(2);
}
void limit_capabilities(void)
--
GitLab