From becfce247ddf247b95cd6b01b709e1c958a15a4d Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Fri, 31 Aug 2018 18:07:25 +0200
Subject: [PATCH] net/nanocoap: allow empty uri/location path option
For CoAP, there is actually a difference between
`/some/path` and `/some/path/`. This needs to be reflected
when parsing the URI and location path options from a given
string.
---
sys/net/application_layer/nanocoap/nanocoap.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sys/net/application_layer/nanocoap/nanocoap.c b/sys/net/application_layer/nanocoap/nanocoap.c
index 43b0cf1422..420d742c70 100644
--- a/sys/net/application_layer/nanocoap/nanocoap.c
+++ b/sys/net/application_layer/nanocoap/nanocoap.c
@@ -603,7 +603,9 @@ size_t coap_opt_put_string(uint8_t *buf, uint16_t lastonum, uint16_t optnum,
part_len = (uint8_t *)uripos - part_start;
- if (part_len) {
+ /* Creates empty option if part for Uri-Path or Uri-Location contains only *
+ * a trailing slash, except for root path ("/"). */
+ if (part_len || ((separator == '/') && (lastonum == optnum))) {
bufpos += coap_put_option(bufpos, lastonum, optnum, part_start, part_len);
lastonum = optnum;
}
@@ -658,7 +660,9 @@ ssize_t coap_opt_add_string(coap_pkt_t *pkt, uint16_t optnum, const char *string
part_len = (uint8_t *)uripos - part_start;
- if (part_len) {
+ /* Creates empty option if part for Uri-Path or Uri-Location contains
+ * only a trailing slash, except for root path ("/"). */
+ if (part_len || ((separator == '/') && write_len)) {
if (pkt->options_len == NANOCOAP_NOPTS_MAX) {
return -ENOSPC;
}
--
GitLab