michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: zoap: advance block context by checking M bit from block option

Browse source 
According to RFC7959 page 30, "The end of a block-wise transfer is
governed by the M bits in the Block options, _not_ by exhausting the
size estimates exchanges."

Therefore, we should check the M bit instead of total size (which
is not always available, too)

Signed-off-by: Robert Chou <robert.ch.chou@acer.com>
This commit is contained in:
Robert Chou 2017-07-13 20:50:40 +08:00 • committed by Jukka Rissanen
commit 33c54ee6fd
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/net/zoap.h
View file

@ -687,12 +687,14 @@ int zoap_update_from_block(const struct zoap_packet *zpkt,
* indicates the correct offset in the body of data being * indicates the correct offset in the body of data being
* transferred. * transferred.
* *
* @param zpkt Packet in which to look for block-wise transfers options
* @param ctx Block context to be updated * @param ctx Block context to be updated
* *
* @return The offset in the block-wise transfer, 0 if the transfer * @return The offset in the block-wise transfer, 0 if the transfer
* has finished. * has finished.
*/ */
size_t zoap_next_block(struct zoap_block_context *ctx); size_t zoap_next_block(const struct zoap_packet *zpkt,
struct zoap_block_context *ctx);
/** /**
* @brief Returns the version present in a CoAP packet. * @brief Returns the version present in a CoAP packet.

2
samples/net/zoap_server/src/zoap-server.c
View file

@ -656,7 +656,7 @@ static int large_get(struct zoap_resource *resource,
return -EINVAL; return -EINVAL;
} }
r = zoap_next_block(&ctx); r = zoap_next_block(&response, &ctx);
if (!r) { if (!r) {
/* Will return 0 when it's the last block. */ /* Will return 0 when it's the last block. */
memset(&ctx, 0, sizeof(ctx)); memset(&ctx, 0, sizeof(ctx));

12
subsys/net/lib/zoap/zoap.c
View file

@ -1270,9 +1270,17 @@ int zoap_update_from_block(const struct zoap_packet *zpkt,
return update_descriptive_block(ctx, block2, size2); return update_descriptive_block(ctx, block2, size2);
} }
size_t zoap_next_block(struct zoap_block_context *ctx) size_t zoap_next_block(const struct zoap_packet *zpkt,
struct zoap_block_context *ctx)
{ {
if (ctx->current >= ctx->total_size) { int block;
if (is_request(zpkt)) {
block = get_block_option(zpkt, ZOAP_OPTION_BLOCK1);
} else {
block = get_block_option(zpkt, ZOAP_OPTION_BLOCK2);
}
if (!GET_MORE(block)) {
return 0; return 0;
} }

2
tests/net/lib/zoap/src/main.c
View file

@ -997,7 +997,7 @@ static int test_block_size(void)
net_pkt_unref(pkt); net_pkt_unref(pkt);
/* Let's try the second packet */ /* Let's try the second packet */
zoap_next_block(&req_ctx); zoap_next_block(&req, &req_ctx);
pkt = net_pkt_get_reserve(&zoap_pkt_slab, 0, K_NO_WAIT); pkt = net_pkt_get_reserve(&zoap_pkt_slab, 0, K_NO_WAIT);
if (!pkt) { if (!pkt) {