RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

net/gcoap: create CoAP ping request

Browse Source
This commit is contained in:
Ken Bannister 2020-04-17 06:10:16 -04:00
parent f5a85e2aff
commit 6eae4ded84
3 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,10 +734,14 @@ void gcoap_register_listener(gcoap_listener_t *listener);
/** /**
* @brief Initializes a CoAP request PDU on a buffer. * @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] pdu Request metadata
* @param[out] buf Buffer containing the PDU * @param[out] buf Buffer containing the PDU
* @param[in] len Length of the buffer * @param[in] len Length of the buffer
* @param[in] code Request code, one of COAP_METHOD_XXX * @param[in] code Request code, one of COAP_METHOD_XXX or COAP_CODE_EMPTY
* to ping
* @param[in] path Resource path, may be NULL * @param[in] path Resource path, may be NULL
* *
* @pre @p path must start with `/` if not NULL * @pre @p path must start with `/` if not NULL

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

@ -657,22 +657,28 @@ int gcoap_req_init(coap_pkt_t *pdu, uint8_t *buf, size_t len,
pdu->hdr = (coap_hdr_t *)buf; pdu->hdr = (coap_hdr_t *)buf;
/* generate token */ /* generate token */
uint16_t msgid = (uint16_t)atomic_fetch_add(&_coap_state.next_message_id, 1);
ssize_t res;
if (code) {
#if CONFIG_GCOAP_TOKENLEN #if CONFIG_GCOAP_TOKENLEN
uint8_t token[CONFIG_GCOAP_TOKENLEN]; uint8_t token[CONFIG_GCOAP_TOKENLEN];
for (size_t i = 0; i < CONFIG_GCOAP_TOKENLEN; i += 4) { for (size_t i = 0; i < CONFIG_GCOAP_TOKENLEN; i += 4) {
uint32_t rand = random_uint32(); uint32_t rand = random_uint32();
memcpy(&token[i], memcpy(&token[i],
&rand, &rand,
(CONFIG_GCOAP_TOKENLEN - i >= 4) ? 4 : CONFIG_GCOAP_TOKENLEN - i); (CONFIG_GCOAP_TOKENLEN - i >= 4) ? 4 : CONFIG_GCOAP_TOKENLEN - i);
} }
uint16_t msgid = (uint16_t)atomic_fetch_add(&_coap_state.next_message_id, 1); res = coap_build_hdr(pdu->hdr, COAP_TYPE_NON, &token[0],
ssize_t res = coap_build_hdr(pdu->hdr, COAP_TYPE_NON, &token[0], CONFIG_GCOAP_TOKENLEN, code, msgid);
CONFIG_GCOAP_TOKENLEN, code, msgid);
#else #else
uint16_t msgid = (uint16_t)atomic_fetch_add(&_coap_state.next_message_id, 1); res = coap_build_hdr(pdu->hdr, COAP_TYPE_NON, NULL,
ssize_t res = coap_build_hdr(pdu->hdr, COAP_TYPE_NON, NULL, CONFIG_GCOAP_TOKENLEN, code, msgid);
CONFIG_GCOAP_TOKENLEN, code, msgid);
#endif #endif
}
else {
/* ping request */
res = coap_build_hdr(pdu->hdr, COAP_TYPE_CON, NULL, 0, code, msgid);
}
coap_pkt_init(pdu, buf, len - CONFIG_GCOAP_REQ_OPTIONS_BUF, res); coap_pkt_init(pdu, buf, len - CONFIG_GCOAP_REQ_OPTIONS_BUF, res);
if (path != NULL) { if (path != NULL) {

23
tests/unittests/tests-gcoap/tests-gcoap.c
View File

@ -203,6 +203,28 @@ static void test_gcoap__client_get_path_defer(void)
TEST_ASSERT_EQUAL_STRING(&path[0], &uri[0]); TEST_ASSERT_EQUAL_STRING(&path[0], &uri[0]);
} }
/*
* Validate client CoAP ping empty message request.
*/
static void test_gcoap__client_ping(void)
{
uint8_t buf[CONFIG_GCOAP_PDU_BUF_SIZE];
coap_pkt_t pdu;
int res;
res = gcoap_req_init(&pdu, buf, CONFIG_GCOAP_PDU_BUF_SIZE, COAP_CODE_EMPTY,
NULL);
TEST_ASSERT_EQUAL_INT(0, res);
TEST_ASSERT_EQUAL_INT(COAP_CODE_EMPTY, coap_get_code(&pdu));
TEST_ASSERT_EQUAL_INT(COAP_TYPE_CON, coap_get_type(&pdu));
TEST_ASSERT_EQUAL_INT(0, coap_get_token_len(&pdu));
/* confirm length */
res = coap_opt_finish(&pdu, COAP_OPT_FINISH_NONE);
TEST_ASSERT_EQUAL_INT(4, res);
}
/* /*
* Helper for server_get tests below. * Helper for server_get tests below.
* Request from libcoap example for gcoap_cli /cli/stats resource * Request from libcoap example for gcoap_cli /cli/stats resource
@ -371,6 +393,7 @@ Test *tests_gcoap_tests(void)
new_TestFixture(test_gcoap__client_put_req), new_TestFixture(test_gcoap__client_put_req),
new_TestFixture(test_gcoap__client_put_req_overfill), new_TestFixture(test_gcoap__client_put_req_overfill),
new_TestFixture(test_gcoap__client_get_path_defer), new_TestFixture(test_gcoap__client_get_path_defer),
new_TestFixture(test_gcoap__client_ping),
new_TestFixture(test_gcoap__server_get_req), new_TestFixture(test_gcoap__server_get_req),
new_TestFixture(test_gcoap__server_get_resp), new_TestFixture(test_gcoap__server_get_resp),
new_TestFixture(test_gcoap__server_con_req), new_TestFixture(test_gcoap__server_con_req),