diff --git a/modules/chain/dap_chain_ledger.c b/modules/chain/dap_chain_ledger.c
index af1201fd203562f82a93ddcfb694c3d8b6a625ef..6c1d7bf8be1dfda11e53aa0a0979cccb91b89fb2 100644
--- a/modules/chain/dap_chain_ledger.c
+++ b/modules/chain/dap_chain_ledger.c
@@ -1672,15 +1672,17 @@ const dap_chain_datum_tx_t* dap_chain_ledger_tx_find_by_pkey(dap_ledger_t *a_led
* a_addr[in] wallet address, whose owner can use the service
*/
dap_chain_datum_tx_t* dap_chain_ledger_tx_cache_find_out_cond(dap_ledger_t *a_ledger,
- dap_chain_addr_t *a_addr, dap_chain_hash_fast_t *a_tx_first_hash)
+ dap_chain_hash_fast_t *a_tx_first_hash, dap_chain_tx_out_cond_t **a_out_cond, int *a_out_cond_idx)
{
- if(!a_addr || !a_tx_first_hash)
+ if (!a_tx_first_hash)
return NULL;
dap_ledger_private_t *l_ledger_priv = PVT(a_ledger);
dap_chain_datum_tx_t *l_cur_tx = NULL;
bool is_null_hash = dap_hash_fast_is_blank(a_tx_first_hash);
bool is_search_enable = is_null_hash;
dap_chain_ledger_tx_item_t *l_iter_current, *l_item_tmp;
+ dap_chain_tx_out_cond_t *l_tx_out_cond;
+ int l_tx_out_cond_idx;
pthread_rwlock_wrlock(&l_ledger_priv->ledger_rwlock);
HASH_ITER(hh, l_ledger_priv->ledger_items, l_iter_current, l_item_tmp)
{
@@ -1692,10 +1694,8 @@ dap_chain_datum_tx_t* dap_chain_ledger_tx_cache_find_out_cond(dap_ledger_t *a_le
is_search_enable = true;
continue;
}
- // Get sign item from transaction
- int l_tx_out_cond_size = 0;
- dap_chain_tx_out_cond_t *l_tx_out_cond = (dap_chain_tx_out_cond_t*) dap_chain_datum_tx_item_get(
- l_tx_tmp, NULL, TX_ITEM_TYPE_OUT_COND, &l_tx_out_cond_size);
+ // Get out_cond item from transaction
+ l_tx_out_cond = dap_chain_datum_tx_out_cond_get(l_tx_tmp, &l_tx_out_cond_idx);
if(l_tx_out_cond) {
l_cur_tx = l_tx_tmp;
@@ -1704,6 +1704,12 @@ dap_chain_datum_tx_t* dap_chain_ledger_tx_cache_find_out_cond(dap_ledger_t *a_le
}
}
pthread_rwlock_unlock(&l_ledger_priv->ledger_rwlock);
+ if (a_out_cond) {
+ *a_out_cond = l_tx_out_cond;
+ }
+ if (a_out_cond_idx) {
+ *a_out_cond_idx = l_tx_out_cond_idx;
+ }
return l_cur_tx;
}
@@ -1727,22 +1733,21 @@ uint64_t dap_chain_ledger_tx_cache_get_out_cond_value(dap_ledger_t *a_ledger, da
//memcpy(&l_tx_first_hash, 0, sizeof(dap_chain_hash_fast_t));
/* size_t l_pub_key_size = a_key_from->pub_key_data_size;
uint8_t *l_pub_key = dap_enc_key_serealize_pub_key(a_key_from, &l_pub_key_size);*/
-
+ dap_chain_tx_out_cond_t *l_tx_out_cond;
// Find all transactions
do {
- l_tx_tmp = dap_chain_ledger_tx_cache_find_out_cond(a_ledger, a_addr, &l_tx_first_hash);
+
+ l_tx_tmp = dap_chain_ledger_tx_cache_find_out_cond(a_ledger, &l_tx_first_hash, &l_tx_out_cond, NULL);
// Get out_cond item from transaction
if(l_tx_tmp) {
- dap_chain_tx_out_cond_t *l_tx_out_cond =(dap_chain_tx_out_cond_t *)dap_chain_datum_tx_item_get(
- l_tx_tmp, NULL, TX_ITEM_TYPE_OUT_COND, NULL);
-
+ UNUSED(a_addr);
// TODO check relations a_addr with cond_data and public key
if(l_tx_out_cond) {
l_ret_value += l_tx_out_cond->header.value;
if(tx_out_cond)
- *tx_out_cond = (dap_chain_tx_out_cond_t*) l_tx_out_cond;
+ *tx_out_cond = l_tx_out_cond;
}
}
} while(l_tx_tmp);
diff --git a/modules/chain/include/dap_chain_ledger.h b/modules/chain/include/dap_chain_ledger.h
index 7639ead95a27511bd31451d6fa19825d26d2ec3b..db95aaa85b98308319e27a94da96b5fb0d154911 100644
--- a/modules/chain/include/dap_chain_ledger.h
+++ b/modules/chain/include/dap_chain_ledger.h
@@ -175,8 +175,7 @@ const dap_chain_datum_tx_t* dap_chain_ledger_tx_find_by_pkey(dap_ledger_t *a_led
char *a_public_key, size_t a_public_key_size, dap_chain_hash_fast_t *a_tx_first_hash);
// Get the transaction in the cache with the out_cond item
-dap_chain_datum_tx_t* dap_chain_ledger_tx_cache_find_out_cond(dap_ledger_t *a_ledger,
- dap_chain_addr_t *a_addr, dap_chain_hash_fast_t *a_tx_first_hash);
+dap_chain_datum_tx_t* dap_chain_ledger_tx_cache_find_out_cond(dap_ledger_t *a_ledger, dap_chain_hash_fast_t *a_tx_first_hash, dap_chain_tx_out_cond_t **a_out_cond, int *a_out_cond_idx);
// Get the value from all transactions in the cache with out_cond item
uint64_t dap_chain_ledger_tx_cache_get_out_cond_value(dap_ledger_t *a_ledger, dap_chain_addr_t *a_addr,
diff --git a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
index bccec32e887a1d84e3a497e29f8bdd222ea299ac..0ffa340dc76e24eee3bddba15d4ca971462d9a8a 100644
--- a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
+++ b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
@@ -432,27 +432,27 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch , void* a_arg)
char * l_tx_in_hash_str = dap_chain_hash_fast_to_str_new(l_tx_in_hash);
log_it(L_NOTICE, "Formed tx %s for input with active receipt", l_tx_in_hash_str);
-
- // We could put transaction directly to chains
+ /* We could put transaction directly to chains
if ( dap_chain_net_get_role( l_usage->net ).enums == NODE_ROLE_MASTER ||
dap_chain_net_get_role( l_usage->net ).enums == NODE_ROLE_CELL_MASTER ||
dap_chain_net_get_role( l_usage->net ).enums == NODE_ROLE_ROOT ||
dap_chain_net_get_role( l_usage->net ).enums == NODE_ROLE_ROOT_MASTER ){
dap_chain_net_proc_mempool( l_usage->net);
- }
+ }*/
DAP_DELETE(l_tx_in_hash_str);
}else
log_it(L_ERROR, "Can't create input tx cond transaction!");
- if (l_tx_in_hash)
- DAP_DELETE(l_tx_in_hash);
- size_t l_success_size = sizeof (dap_stream_ch_chain_net_srv_pkt_success_hdr_t );
+ size_t l_success_size = sizeof(dap_stream_ch_chain_net_srv_pkt_success_hdr_t) + sizeof(dap_chain_hash_fast_t);
dap_stream_ch_chain_net_srv_pkt_success_t *l_success = DAP_NEW_Z_SIZE(dap_stream_ch_chain_net_srv_pkt_success_t,
l_success_size);
l_success->hdr.usage_id = l_usage->id;
l_success->hdr.net_id.uint64 = l_usage->net->pub.id.uint64;
l_success->hdr.srv_uid.uint64 = l_usage->service->uid.uint64;
-
+ if (l_tx_in_hash) {
+ memcpy(l_success->custom_data, l_tx_in_hash, sizeof(dap_chain_hash_fast_t));
+ DAP_DELETE(l_tx_in_hash);
+ }
dap_stream_ch_pkt_write( a_ch, DAP_STREAM_CH_CHAIN_NET_SRV_PKT_TYPE_RESPONSE_SUCCESS ,
l_success, l_success_size);
DAP_DELETE(l_success);
diff --git a/modules/common/common.pri b/modules/common/common.pri
index 90bfde174240c078988a9483dea8d5e48966ad17..6308c85469151609d4cd8ec1381e455906e70e8c 100644
--- a/modules/common/common.pri
+++ b/modules/common/common.pri
@@ -19,7 +19,6 @@ SOURCES += $$PWD/dap_chain_common.c \
$$PWD/dap_chain_datum_token.c \
$$PWD/dap_chain_datum_tx.c \
$$PWD/dap_chain_datum_tx_items.c \
- $$PWD/dap_chain_datum_tx_out_cond.c \
$$PWD/dap_chain_datum_tx_receipt.c \
$$PWD/dap_chain_datum_tx_token.c
diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c
index d103711c103eb8e8c2fdaab895fea8cbaafa3b2b..2f72e5d0bb1a829fce3d4a17f8c34f50d7ec50a0 100644
--- a/modules/mempool/dap_chain_mempool.c
+++ b/modules/mempool/dap_chain_mempool.c
@@ -361,23 +361,64 @@ dap_chain_hash_fast_t* dap_chain_mempool_tx_create_cond_input(dap_chain_net_t *
uint16_t pos=0;
dap_chain_datum_tx_add_item(&l_tx, (byte_t*) l_receipt);
pos++;
+ uint64_t l_value_send = l_receipt->receipt_info.value_datoshi;
// add 'in_cond' items
- dap_chain_datum_tx_t *l_cond_tx = dap_chain_ledger_tx_find_by_hash(l_ledger, a_tx_prev_hash);
+ dap_chain_datum_tx_t *l_tx_cond = dap_chain_ledger_tx_find_by_hash(l_ledger, a_tx_prev_hash);
int l_prev_cond_idx;
- dap_chain_datum_tx_out_cond_get(l_cond_tx, &l_prev_cond_idx);
+ dap_chain_tx_out_cond_t *l_out_cond = dap_chain_datum_tx_out_cond_get(l_tx_cond, &l_prev_cond_idx);
+ if (dap_chain_ledger_tx_hash_is_used_out_item(l_ledger, a_tx_prev_hash, l_prev_cond_idx)) {
+ dap_chain_datum_tx_t *l_tx_tmp;
+ dap_chain_hash_fast_t l_tx_cur_hash = { 0 }; // start hash
+ dap_chain_tx_out_cond_t *l_tmp_cond;
+ uint64_t l_value_cond = 0;
+ int l_tmp_cond_idx;
+ // Find all transactions
+ while (l_value_cond < l_value_send) {
+ l_tx_tmp = dap_chain_ledger_tx_cache_find_out_cond(l_ledger, &l_tx_cur_hash, &l_tmp_cond, &l_tmp_cond_idx);
+ if (!l_tx_tmp) {
+ break;
+ }
+ if (dap_chain_ledger_tx_hash_is_used_out_item(l_ledger, &l_tx_cur_hash, l_tmp_cond_idx))
+ continue;
+ if (l_tmp_cond->header.subtype != l_out_cond->header.subtype)
+ continue;
+ if (l_tmp_cond->subtype.srv_pay.srv_uid.uint64 != l_out_cond->subtype.srv_pay.srv_uid.uint64)
+ continue;
+ if (l_tmp_cond->subtype.srv_pay.unit.uint32 != l_out_cond->subtype.srv_pay.unit.uint32)
+ continue;
+ if (l_tmp_cond->subtype.srv_pay.unit_price_max_datoshi != l_out_cond->subtype.srv_pay.unit_price_max_datoshi)
+ continue;
+ if (memcmp(&l_tmp_cond->subtype.srv_pay.pkey_hash, &l_out_cond->subtype.srv_pay.pkey_hash, sizeof(dap_chain_hash_fast_t)))
+ continue;
+ l_value_cond = l_tmp_cond->header.value;
+ }
+ if (l_value_cond < l_value_send) {
+ log_it(L_WARNING, "Requested conditional transaction is already used out");
+ return NULL;
+ }
+ }
if (dap_chain_datum_tx_add_in_cond_item(&l_tx, a_tx_prev_hash, l_prev_cond_idx, pos-1) != 0 ){
dap_chain_datum_tx_delete(l_tx);
log_it( L_ERROR, "Cant add tx cond input");
return NULL;
}
- if(dap_chain_datum_tx_add_out_item(&l_tx, a_addr_to, l_receipt->receipt_info.value_datoshi) != 1) {
+ // add 'out' item
+ if (dap_chain_datum_tx_add_out_item(&l_tx, a_addr_to, l_value_send) != 1) {
dap_chain_datum_tx_delete(l_tx);
log_it( L_ERROR, "Cant add tx output");
return NULL;
}
+ //add 'out_cond' item
+ size_t l_size = dap_chain_datum_item_tx_get_size((uint8_t *)l_out_cond);
+ dap_chain_tx_out_cond_t *l_out_cond_new = DAP_NEW_Z_SIZE(dap_chain_tx_out_cond_t, l_size);
+ memcpy(l_out_cond_new, l_out_cond, l_size);
+ l_out_cond_new->header.value -= l_value_send;
+ dap_chain_datum_tx_add_item(&l_tx, (const uint8_t *)l_out_cond_new);
+ DAP_DELETE(l_out_cond_new);
+
// add 'sign' items
if (l_key_tx_sign){
if(dap_chain_datum_tx_add_sign_item(&l_tx, l_key_tx_sign) != 1) {
@@ -394,7 +435,13 @@ dap_chain_hash_fast_t* dap_chain_mempool_tx_create_cond_input(dap_chain_net_t *
DAP_DELETE( l_tx );
char * l_key_str = dap_chain_hash_fast_to_str_new( l_key_hash );
- char * l_gdb_group = dap_chain_net_get_gdb_group_mempool_by_chain_type( a_net ,CHAIN_TYPE_TX);
+
+ char * l_gdb_group;
+ if(a_net->pub.default_chain)
+ l_gdb_group = dap_chain_net_get_gdb_group_mempool(a_net->pub.default_chain);
+ else
+ l_gdb_group = dap_chain_net_get_gdb_group_mempool_by_chain_type( a_net ,CHAIN_TYPE_TX);
+
if( dap_chain_global_db_gr_set( dap_strdup(l_key_str), (uint8_t *) l_datum, dap_chain_datum_size(l_datum)
, l_gdb_group ) ) {
log_it(L_NOTICE, "Transaction %s placed in mempool", l_key_str);
@@ -874,7 +921,6 @@ void chain_mempool_proc(struct dap_http_simple *cl_st, void * arg)
{
dap_datum_mempool_free(datum_mempool);
char *a_key = calc_datum_hash(request_str, (size_t) request_size);
- char *a_value;
switch (action)
{
case DAP_DATUM_MEMPOOL_ADD: // add datum in base
diff --git a/modules/net/dap_chain_net_bugreport.c b/modules/net/dap_chain_net_bugreport.c
index 9d466d317a1ad3b0fb042fe6bcc66aa0e52806b6..63b00ba2db583f225e8a43544ec5283ac7257eec 100644
--- a/modules/net/dap_chain_net_bugreport.c
+++ b/modules/net/dap_chain_net_bugreport.c
@@ -78,6 +78,7 @@ static int bugreport_write_to_file(byte_t *a_request_byte, size_t a_request_size
static void bugreport_http_proc(struct dap_http_simple *a_http_simple, void * a_arg)
{
// data:text/html,<form action=http://192.168.100.92:8079/bugreport/ method=post><input name=a></form>
+ // data:text/html,<form action=http://cdb.klvn.io/bugreport/ method=post><input name=a></form>
log_it(L_DEBUG, "bugreport_http_proc request");
http_status_code_t * return_code = (http_status_code_t*) a_arg;
//if(dap_strcmp(cl_st->http->url_path, BUGREPORT_URL) == 0 )
diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c
index 82e0eba706c69e9bf9ffe08831294ad56d4b3e5d..7e000f75d5159022319fbabb97d6e9d0a6687097 100644
--- a/modules/net/dap_chain_node_cli.c
+++ b/modules/net/dap_chain_node_cli.c
@@ -957,11 +957,11 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
dap_chain_node_cli_cmd_item_create ("exit", com_exit, NULL, "Stop application and exit",
"exit\n" );
-#ifndef _WIN32
+//#ifndef _WIN32
// News
- //dap_chain_node_cli_cmd_item_create("news", com_news, NULL, "Add News for VPN clients. Language code is a text code like \"en\", \"ru\", \"fr\"",
- // "news [-text <news text> | -file <filename with news>] -lang <language code> \n");
-#endif
+ dap_chain_node_cli_cmd_item_create("news", com_news, NULL, "Add News for VPN clients. Language code is a text code like \"en\", \"ru\", \"fr\"",
+ "news [-text <news text> | -file <filename with news>] -lang <language code> \n");
+//#endif
// create thread for waiting of clients
pthread_t l_thread_id;
diff --git a/modules/net/include/dap_chain_node_cli_cmd.h b/modules/net/include/dap_chain_node_cli_cmd.h
index ed35ce7a41a31ff70b4783b6806dc58206ccbf3a..dc5f569568a615c76df8732a082f3a29e8208b84 100644
--- a/modules/net/include/dap_chain_node_cli_cmd.h
+++ b/modules/net/include/dap_chain_node_cli_cmd.h
@@ -133,10 +133,10 @@ int com_stats(int argc, char ** argv, void *arg_func, char **str_reply);
int com_exit(int argc, char ** argv, void *arg_func, char **str_reply);
-#ifndef _WIN32
+//#ifndef _WIN32
// Add News for VPN clients
-//int com_news(int a_argc, char ** a_argv, void *a_arg_func, char **a_str_reply);
-#endif
+int com_news(int a_argc, char ** a_argv, void *a_arg_func, char **a_str_reply);
+//#endif
// vpn_client command
int com_vpn_client(int a_argc, char ** a_argv, void *arg_func, char **a_str_reply);
diff --git a/modules/net/srv/dap_chain_net_srv_geoip.c b/modules/net/srv/dap_chain_net_srv_geoip.c
index a0f1a31b0b300f7c9d755fda8a7057b377f1c7f2..ff7aea1c4fe3aaa8ed24b9d9fe8cb08602728be6 100644
--- a/modules/net/srv/dap_chain_net_srv_geoip.c
+++ b/modules/net/srv/dap_chain_net_srv_geoip.c
@@ -37,6 +37,9 @@
#define LOG_TAG "chain_net_srv_geoip"
#define LOCALE_DEFAULT "en"
+
+static char *s_geoip_db_file_path = NULL; // share/geoip/GeoLite2-City.mmdb
+
/**
* @brief m_request_response
* @param a_response
@@ -168,18 +171,18 @@ geoip_info_t *chain_net_geoip_get_ip_info_by_local_db(const char *a_ip_str, cons
{
// https://geoip.maxmind.com/geoip/v2.1/city/178.7.88.55
// https://maxmind.github.io/libmaxminddb/
- char *l_file_db_name = dap_strdup_printf("%s/share/geoip/GeoLite2-City.mmdb", g_sys_dir_path);
- if(!dap_file_test(l_file_db_name)) {
- DAP_DELETE(l_file_db_name);
+ //char *l_file_db_name = dap_strdup_printf("%s/share/geoip/GeoLite2-City.mmdb", g_sys_dir_path);
+ if(!dap_file_test(s_geoip_db_file_path)) {
+ //DAP_DELETE(l_file_db_name);
return NULL ;
}
MMDB_s mmdb;
- int l_status = MMDB_open(l_file_db_name, MMDB_MODE_MMAP, &mmdb);
+ int l_status = MMDB_open(s_geoip_db_file_path, MMDB_MODE_MMAP, &mmdb);
if(MMDB_SUCCESS != l_status) {
- log_it(L_WARNING, "geoip file %s opened with errcode=%d", l_file_db_name, l_status);
+ log_it(L_WARNING, "geoip file %s opened with errcode=%d", s_geoip_db_file_path, l_status);
return NULL ;
}
- DAP_DELETE(l_file_db_name);
+ //DAP_DELETE(l_file_db_name);
geoip_info_t *l_ret = DAP_NEW_Z(geoip_info_t);
@@ -252,3 +255,25 @@ geoip_info_t *chain_net_geoip_get_ip_info(const char *a_ip_str)
return chain_net_geoip_get_ip_info_by_local_db(a_ip_str, "en");
//return chain_net_geoip_get_ip_info_by_web(a_ip_str);
}
+
+
+int chain_net_geoip_init(dap_config_t *a_config)
+{
+ s_geoip_db_file_path = dap_strdup_printf("%s/%s", g_sys_dir_path,
+ dap_config_get_item_str(g_config, "resources", "geoip_db_path"));
+ if(!dap_file_test(s_geoip_db_file_path)) {
+ log_it(L_ERROR, "No exists geoip db file %s", s_geoip_db_file_path);
+ DAP_DELETE(s_geoip_db_file_path);
+ s_geoip_db_file_path = NULL;
+ return -1;
+ }
+ MMDB_s mmdb;
+ int l_status = MMDB_open(s_geoip_db_file_path, MMDB_MODE_MMAP, &mmdb);
+ if(MMDB_SUCCESS != l_status) {
+ log_it(L_WARNING, "geoip file %s opened with errcode=%d", s_geoip_db_file_path, l_status);
+ DAP_DELETE(s_geoip_db_file_path);
+ s_geoip_db_file_path = NULL;
+ return -2;
+ }
+ return 0;
+}
diff --git a/modules/net/srv/dap_chain_net_srv_geoip.h b/modules/net/srv/dap_chain_net_srv_geoip.h
index 714dbc62f243ff722285a3633aaaf04324787352..1f8ecd5be3044900d83bb46f28e492e5a493cac4 100644
--- a/modules/net/srv/dap_chain_net_srv_geoip.h
+++ b/modules/net/srv/dap_chain_net_srv_geoip.h
@@ -22,6 +22,8 @@
along with any DAP based project. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "dap_config.h"
+
typedef struct geoip_info {
char ip_str[20];
@@ -35,3 +37,5 @@ typedef struct geoip_info {
} geoip_info_t;
geoip_info_t *chain_net_geoip_get_ip_info(const char *a_ip_str);
+
+int chain_net_geoip_init(dap_config_t *a_config);
diff --git a/modules/service/vpn/dap_chain_net_srv_vpn_cdb_server_list.c b/modules/service/vpn/dap_chain_net_srv_vpn_cdb_server_list.c
index 80fe55c56b779a4bfcbfc0bbc967b2aaad8645ef..b03956319f890a8f994e5de51b97f28eb3508e52 100644
--- a/modules/service/vpn/dap_chain_net_srv_vpn_cdb_server_list.c
+++ b/modules/service/vpn/dap_chain_net_srv_vpn_cdb_server_list.c
@@ -156,7 +156,7 @@ static void s_http_simple_proc(dap_http_simple_t *a_http_simple, void *a_arg)
dap_string_t *l_reply_str = dap_string_new("[\n");
- char *l_client_ip = a_http_simple->http->client->s_ip;//"77.222.110.44"
+ char *l_client_ip = a_http_simple->http->client->s_ip;//"64.225.61.216"
geoip_info_t *l_geoip_info = chain_net_geoip_get_ip_info(l_client_ip);
log_it(L_DEBUG, "Have %zd chain networks for cdb lists", s_cdb_net_count );
@@ -232,28 +232,39 @@ static void s_http_simple_proc(dap_http_simple_t *a_http_simple, void *a_arg)
int8_t l_client_continent = l_geoip_info ? dap_chain_net_srv_order_continent_to_num(l_geoip_info->continent) : 0;
// random node on client's continent
- if (l_client_continent) {
- int l_count = 0;
- while (l_orders_num > 0) {
- size_t k = rand() % l_continents_numbers[l_client_continent];
- dap_chain_net_srv_order_t *l_order = l_orders_pos[k];
- const char *country_code = dap_chain_net_srv_order_get_country_code(l_order);
- if (country_code) {
- // only for other countries
- if (dap_strcmp(l_geoip_info->country_code, country_code)){
- if (!order_info_print(l_reply_str, l_net, l_order, "Auto", -1)) {
- dap_string_append_printf(l_reply_str, ",\n");
- break;
- }
- }
- }
- if (l_count > 20)
- break;
- l_count++;
- }
+ if(l_client_continent > 0 && l_continents_numbers[l_client_continent] > 1) {
+ int l_count = 0;
+ while(l_orders_num > 0) {
+ size_t k = rand() % l_continents_numbers[l_client_continent];
+ size_t l_node_pos = -1;
+ for(size_t j2 = 0; j2 <= l_orders_num; j2++) {
+ if(k == l_node_numbering[l_client_continent][j2]) {
+ l_node_pos = j2;
+ break;
+ }
+ }
+ if(l_node_pos == -1) {
+ // random node for the whole world
+ l_node_pos = rand() % l_orders_num;
+ }
+ dap_chain_net_srv_order_t *l_order = l_orders_pos[l_node_pos];
+ const char *country_code = dap_chain_net_srv_order_get_country_code(l_order);
+ if(country_code) {
+ // only for other countries
+ if(dap_strcmp(l_geoip_info->country_code, country_code)) {
+ if(!order_info_print(l_reply_str, l_net, l_order, "Auto", -1)) {
+ dap_string_append_printf(l_reply_str, ",\n");
+ break;
+ }
+ }
+ }
+ if(l_count > 20)
+ break;
+ l_count++;
+ }
- }
- // random node for the whole world
+ }
+ // random node for the whole world
else {
int l_count = 0;
while(l_orders_num > 0) {