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

Merge pull request #11802 from kaspar030/fix_coap_get_block2

Browse Source 
nanocoap: make coap_get_block2() actually fill struct
This commit is contained in:
Ken Bannister 2019-07-08 09:29:44 -04:00 committed by GitHub
commit 210265cbce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -641,30 +641,33 @@ size_t coap_put_option_block1(uint8_t *buf, uint16_t lastonum, unsigned blknum,
return coap_put_option_block(buf, lastonum, blknum, szx, more, COAP_OPT_BLOCK1); return coap_put_option_block(buf, lastonum, blknum, szx, more, COAP_OPT_BLOCK1);
} }
int coap_get_block1(coap_pkt_t *pkt, coap_block1_t *block1) int coap_get_block(coap_pkt_t *pkt, coap_block1_t *block, uint16_t blkopt)
{ {
uint32_t blknum; uint32_t blknum;
unsigned szx; unsigned szx;
block1->more = coap_get_blockopt(pkt, COAP_OPT_BLOCK1, &blknum, &szx); block->more = coap_get_blockopt(pkt, blkopt, &blknum, &szx);
if (block1->more >= 0) { if (block->more >= 0) {
block1->offset = blknum << (szx + 4); block->offset = blknum << (szx + 4);
} }
else { else {
block1->offset = 0; block->offset = 0;
} }
block1->blknum = blknum; block->blknum = blknum;
block1->szx = szx; block->szx = szx;
return (block1->more >= 0); return (block->more >= 0);
} }
int coap_get_block2(coap_pkt_t *pkt, coap_block1_t *block2) int coap_get_block1(coap_pkt_t *pkt, coap_block1_t *block)
{ {
block2->more = coap_get_blockopt(pkt, COAP_OPT_BLOCK2, &block2->blknum, return coap_get_block(pkt, block, COAP_OPT_BLOCK1);
&block2->szx); }
return (block2->more >= 0);
int coap_get_block2(coap_pkt_t *pkt, coap_block1_t *block)
{
return coap_get_block(pkt, block, COAP_OPT_BLOCK2);
} }
size_t coap_put_block1_ok(uint8_t *pkt_pos, coap_block1_t *block1, uint16_t lastonum) size_t coap_put_block1_ok(uint8_t *pkt_pos, coap_block1_t *block1, uint16_t lastonum)