From f9c408e72b5c98670438f0bac13dcf9da4147f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?=
<alexander.lysikov@demlabs.net>
Date: Mon, 20 Apr 2020 20:45:42 +0500
Subject: [PATCH] added context parameter to the console command
---
dap_chain_net_srv.c | 6 +++---
dap_chain_net_srv_order.c | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dap_chain_net_srv.c b/dap_chain_net_srv.c
index 2474704..8d7b821 100755
--- a/dap_chain_net_srv.c
+++ b/dap_chain_net_srv.c
@@ -70,7 +70,7 @@ typedef struct service_list {
static service_list_t *s_srv_list = NULL;
// for separate access to s_srv_list
static pthread_mutex_t s_srv_list_mutex = PTHREAD_MUTEX_INITIALIZER;
-static int s_cli_net_srv( int argc, char **argv, char **a_str_reply);
+static int s_cli_net_srv( int argc, char **argv, void *arg_func, char **a_str_reply);
static void s_load(const char * a_path);
static void s_load_all(void);
@@ -85,7 +85,7 @@ int dap_chain_net_srv_init(dap_config_t * a_cfg)
if( dap_chain_net_srv_order_init() != 0 )
return -1;
- dap_chain_node_cli_cmd_item_create ("net_srv", s_cli_net_srv, "Network services managment",
+ dap_chain_node_cli_cmd_item_create ("net_srv", s_cli_net_srv, NULL, "Network services managment",
"net_srv -net <chain net name> order find [-direction <sell|buy>][-srv_uid <Service UID>] [-price_unit <price unit>]\\\n"
" [-price_token <Token ticker>] [-price_min <Price minimum>] [-price_max <Price maximum>]\n"
"\tOrders list, all or by UID and/or class\n"
@@ -169,7 +169,7 @@ void dap_chain_net_srv_deinit(void)
* @param a_str_reply
* @return
*/
-static int s_cli_net_srv( int argc, char **argv, char **a_str_reply)
+static int s_cli_net_srv( int argc, char **argv, void *arg_func, char **a_str_reply)
{
int arg_index = 1;
dap_chain_net_t * l_net = NULL;
diff --git a/dap_chain_net_srv_order.c b/dap_chain_net_srv_order.c
index 8ac6e2c..104424e 100644
--- a/dap_chain_net_srv_order.c
+++ b/dap_chain_net_srv_order.c
@@ -108,9 +108,11 @@ bool dap_chain_net_srv_order_get_continent_region(dap_chain_net_srv_order_t *a_o
if(!a_order || !a_order->ext_size || !a_order->ext || a_order->ext[0]!=0x52)
return false;
if(a_continent_num) {
- memcpy(a_continent_num, a_order->ext + 1, sizeof(uint8_t));
- }
- else
+ if((uint8_t)a_order->ext[1]!=0xff)
+ memcpy(a_continent_num, a_order->ext + 1, sizeof(uint8_t));
+ else
+ a_continent_num = 0;
+ }else
a_continent_num = 0;
if(a_region) {
size_t l_size = a_order->ext_size - sizeof(uint8_t) - 1;
--
GitLab