Skip to content
Snippets Groups Projects
Commit 81ce7ad2 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Merge branch 'features-8984' into 'develop'

Features 8984

See merge request !1187
parents 53a51898 dbd68f17
No related branches found
No related tags found
1 merge request!1187Features 8984
Pipeline #28515 passed with stage
in 13 minutes and 29 seconds
...@@ -788,6 +788,7 @@ int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, cons ...@@ -788,6 +788,7 @@ int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, cons
l_price->units = l_order->units; l_price->units = l_order->units;
l_price->units_uid = l_order->price_unit; l_price->units_uid = l_order->price_unit;
l_price->wallet = l_wallet; l_price->wallet = l_wallet;
DL_APPEND(a_srv->pricelist, l_price);
break; break;
} }
DAP_DELETE(l_order); DAP_DELETE(l_order);
...@@ -911,7 +912,6 @@ dap_chain_net_srv_t* dap_chain_net_srv_add(dap_chain_net_srv_uid_t a_uid, ...@@ -911,7 +912,6 @@ dap_chain_net_srv_t* dap_chain_net_srv_add(dap_chain_net_srv_uid_t a_uid,
strncpy(l_sdata->name, a_config_section, sizeof(l_sdata->name) - 1); strncpy(l_sdata->name, a_config_section, sizeof(l_sdata->name) - 1);
l_sdata->srv = l_srv; l_sdata->srv = l_srv;
dap_chain_net_srv_price_apply_from_my_order(l_srv, a_config_section); dap_chain_net_srv_price_apply_from_my_order(l_srv, a_config_section);
dap_chain_net_srv_parse_pricelist(l_srv, a_config_section);
HASH_ADD(hh, s_srv_list, uid, sizeof(l_srv->uid), l_sdata); HASH_ADD(hh, s_srv_list, uid, sizeof(l_srv->uid), l_sdata);
}else{ }else{
log_it(L_ERROR, "Already present service with 0x%016"DAP_UINT64_FORMAT_X, a_uid.uint64); log_it(L_ERROR, "Already present service with 0x%016"DAP_UINT64_FORMAT_X, a_uid.uint64);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment