RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

gcoap: provide buffer version of gcoap_req_init()

Browse Source 
This simplifies the usage of `gcoap` with modules such as `uri_parser`
greatly.
This commit is contained in:
Martine Lenders 2021-08-05 11:24:09 +02:00
parent adce90343c
commit 5d59065b09
No known key found for this signature in database
GPG Key ID: 2134D77A5336DD80
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/include/net/gcoap.h
View File

@ -844,15 +844,43 @@ void gcoap_register_listener(gcoap_listener_t *listener);
* @param[in] len Length of the buffer * @param[in] len Length of the buffer
* @param[in] code Request code, one of COAP_METHOD_XXX or COAP_CODE_EMPTY * @param[in] code Request code, one of COAP_METHOD_XXX or COAP_CODE_EMPTY
* to ping * to ping
* @param[in] path Resource path, may be NULL * @param[in] path Resource path, may be NULL. @p path_len will be ignored
* in that case.
* @param[in] path_len Length of @p path.
* *
* @pre @p path must start with `/` if not NULL * @pre @p path must start with `/` if not NULL
* *
* @return 0 on success * @return 0 on success
* @return < 0 on error * @return < 0 on error
*/ */
int gcoap_req_init(coap_pkt_t *pdu, uint8_t *buf, size_t len, int gcoap_req_init_path_buffer(coap_pkt_t *pdu, uint8_t *buf, size_t len,
unsigned code, const char *path); unsigned code, const char *path,
size_t path_len);
/**
* @brief Initializes a CoAP request PDU on a buffer.
*
* If @p code is COAP_CODE_EMPTY, prepares a complete "CoAP ping" 4 byte empty
* message request, ready to send.
*
* @param[out] pdu Request metadata
* @param[out] buf Buffer containing the PDU
* @param[in] len Length of the buffer
* @param[in] code Request code, one of COAP_METHOD_XXX or COAP_CODE_EMPTY
* to ping
* @param[in] path `\0`-terminated resource path, may be NULL
*
* @pre @p path must start with `/` if not NULL
*
* @return 0 on success
* @return < 0 on error
*/
static inline int gcoap_req_init(coap_pkt_t *pdu, uint8_t *buf, size_t len,
unsigned code, const char *path)
{
return gcoap_req_init_path_buffer(pdu, buf, len, code, path,
(path) ? strlen(path) : 0U);
}
/** /**
* @brief Writes a complete CoAP request PDU when there is not a payload * @brief Writes a complete CoAP request PDU when there is not a payload

8
sys/net/application_layer/gcoap/gcoap.c
View File

@ -1023,8 +1023,8 @@ void gcoap_register_listener(gcoap_listener_t *listener)
} }
} }
int gcoap_req_init(coap_pkt_t *pdu, uint8_t *buf, size_t len, int gcoap_req_init_path_buffer(coap_pkt_t *pdu, uint8_t *buf, size_t len,
unsigned code, const char *path) unsigned code, const char *path, size_t path_len)
{ {
assert((path == NULL) || (path[0] == '/')); assert((path == NULL) || (path[0] == '/'));
@ -1055,8 +1055,8 @@ int gcoap_req_init(coap_pkt_t *pdu, uint8_t *buf, size_t len,
} }
coap_pkt_init(pdu, buf, len, res); coap_pkt_init(pdu, buf, len, res);
if (path != NULL) { if ((path != NULL) && (path_len > 0)) {
res = coap_opt_add_uri_path(pdu, path); res = coap_opt_add_uri_path_buffer(pdu, path, path_len);
} }
return (res > 0) ? 0 : res; return (res > 0) ? 0 : res;
} }