Skip to content
Snippets Groups Projects

...

Merged Constantin P. requested to merge hotfix-080223-part1 into release-5.2
3 files
+ 12
12
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -53,22 +53,19 @@ size_t dap_stream_ch_chain_pkt_write_unsafe(dap_stream_ch_t *a_ch, uint8_t a_typ
uint64_t a_chain_id, uint64_t a_cell_id,
const void * a_data, size_t a_data_size)
{
dap_stream_ch_chain_pkt_t * l_chain_pkt;
size_t l_chain_pkt_size = sizeof (l_chain_pkt->hdr) + a_data_size;
l_chain_pkt = DAP_NEW_Z_SIZE(dap_stream_ch_chain_pkt_t, l_chain_pkt_size );
l_chain_pkt->hdr.version = 1;
l_chain_pkt->hdr.net_id.uint64 = a_net_id;
l_chain_pkt->hdr.cell_id.uint64 = a_cell_id;
l_chain_pkt->hdr.chain_id.uint64 = a_chain_id;
size_t l_chain_pkt_size = sizeof(dap_stream_ch_chain_pkt_hdr_t) + a_data_size;
dap_stream_ch_chain_pkt_t *l_chain_pkt = DAP_NEW_STACK_SIZE(dap_stream_ch_chain_pkt_t, l_chain_pkt_size);
*l_chain_pkt = (dap_stream_ch_chain_pkt_t){
.hdr = { .version = 1, .net_id.uint64 = a_net_id, .cell_id.uint64 = a_cell_id, .chain_id.uint64 = a_chain_id }
};
if (a_data_size && a_data)
memcpy( l_chain_pkt->data, a_data, a_data_size);
memcpy(l_chain_pkt->data, a_data, a_data_size);
size_t l_ret = dap_stream_ch_pkt_write_unsafe(a_ch, a_type , l_chain_pkt, l_chain_pkt_size);
DAP_DELETE(l_chain_pkt);
return l_ret;
return dap_stream_ch_pkt_write_unsafe(a_ch, a_type , l_chain_pkt, l_chain_pkt_size);
}
/**
* @brief dap_stream_ch_chain_pkt_write_mt
* @param a_worker
Loading