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

nanocoap: allow coap_opt_add_string() for zero-terminated strings

Browse Source
This commit is contained in:
Cenk Gündoğan 2020-04-02 00:33:29 +02:00
parent 98fa7414a0
commit ea616abfda
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/include/net/nanocoap.h
View File

@ -1046,6 +1046,27 @@ static inline ssize_t coap_opt_add_uri_query(coap_pkt_t *pkt, const char *key,
*/ */
ssize_t coap_opt_add_proxy_uri(coap_pkt_t *pkt, const char *uri); ssize_t coap_opt_add_proxy_uri(coap_pkt_t *pkt, const char *uri);
/**
* @brief Encode the given array of characters as option(s) into pkt
*
* Use separator to split array of characters into multiple options.
*
* @post pkt.payload advanced to first byte after option(s)
* @post pkt.payload_len reduced by option(s) length
*
* @param[in,out] pkt pkt referencing target buffer
* @param[in] optnum option number to use
* @param[in] chars array of characters to encode as option
* @param[in] chars_len length of @p chars
* @param[in] separator character used in @p string to separate parts
*
* @return number of bytes written to buffer
* @return <0 on error
* @return -ENOSPC if no available options or insufficient buffer space
*/
ssize_t coap_opt_add_chars(coap_pkt_t *pkt, uint16_t optnum, const char *chars,
size_t chars_len, char separator);
/** /**
* @brief Encode the given string as option(s) into pkt * @brief Encode the given string as option(s) into pkt
* *
@ -1063,7 +1084,11 @@ ssize_t coap_opt_add_proxy_uri(coap_pkt_t *pkt, const char *uri);
* @return <0 on error * @return <0 on error
* @return -ENOSPC if no available options or insufficient buffer space * @return -ENOSPC if no available options or insufficient buffer space
*/ */
ssize_t coap_opt_add_string(coap_pkt_t *pkt, uint16_t optnum, const char *string, char separator); static inline ssize_t coap_opt_add_string(coap_pkt_t *pkt, uint16_t optnum,
const char *string, char separator)
{
return coap_opt_add_chars(pkt, optnum, string, strlen(string), separator);
}
/** /**
* @brief Adds one or multiple Uri-Path options in the form '/path' into pkt * @brief Adds one or multiple Uri-Path options in the form '/path' into pkt

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

@ -819,28 +819,31 @@ static ssize_t _add_opt_pkt(coap_pkt_t *pkt, uint16_t optnum, const uint8_t *val
return optlen; return optlen;
} }
ssize_t coap_opt_add_string(coap_pkt_t *pkt, uint16_t optnum, const char *string, ssize_t coap_opt_add_chars(coap_pkt_t *pkt, uint16_t optnum, const char *chars,
char separator) size_t chars_len, char separator)
{ {
size_t unread_len = strlen(string); /* chars_len denotes the length of the chars buffer and is
if (!unread_len) { * gradually decremented below while iterating over the buffer */
if (!chars_len) {
return 0; return 0;
} }
char *uripos = (char *)string;
char *uripos = (char *)chars;
char *endpos = ((char *)chars + chars_len);
size_t write_len = 0; size_t write_len = 0;
while (unread_len) { while (chars_len) {
size_t part_len; size_t part_len;
if (*uripos == separator) { if (*uripos == separator) {
uripos++; uripos++;
} }
uint8_t *part_start = (uint8_t *)uripos; uint8_t *part_start = (uint8_t *)uripos;
while (unread_len) { while (chars_len) {
/* must decrement separately from while loop test to ensure /* must decrement separately from while loop test to ensure
* the value remains non-negative */ * the value remains non-negative */
unread_len--; chars_len--;
if ((*uripos == separator) || (*uripos == '\0')) { if ((*uripos == separator) || (uripos == endpos)) {
break; break;
} }
uripos++; uripos++;