riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/nanocoap: use block init helper internally

Browse Source
This commit is contained in:
Ken Bannister 2019-02-08 12:44:31 -05:00
parent 69efaa1d56
commit 86edea81be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/net/application_layer/nanocoap/nanocoap.c
View File

@ -710,14 +710,14 @@ size_t coap_put_block1_ok(uint8_t *pkt_pos, coap_block1_t *block1, uint16_t last
size_t coap_opt_put_block(uint8_t *buf, uint16_t lastonum, coap_block_slicer_t *slicer, size_t coap_opt_put_block(uint8_t *buf, uint16_t lastonum, coap_block_slicer_t *slicer,
bool more, uint16_t option) bool more, uint16_t option)
{ {
unsigned szx = _size2szx(slicer->end - slicer->start); coap_block1_t block;
unsigned blknum = _slicer_blknum(slicer);
uint32_t blkopt = (blknum << 4) | szx | (more ? 0x8 : 0); coap_block_object_init(&block, _slicer_blknum(slicer),
size_t olen = _encode_uint(&blkopt); slicer->end - slicer->start, more);
slicer->opt = buf; slicer->opt = buf;
return coap_put_option(buf, lastonum, option, (uint8_t *)&blkopt, olen);
return coap_opt_put_block_object(buf, lastonum, &block, option);
} }
size_t coap_opt_put_block_object(uint8_t *buf, uint16_t lastonum, size_t coap_opt_put_block_object(uint8_t *buf, uint16_t lastonum,