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

net/gcoap: Add server piggybacked ACK response to a CON request

Browse Source
This commit is contained in:
Ken Bannister 2017-06-21 13:08:10 -04:00
parent 30be4f7673
commit 19ba56b96f
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,8 @@
* gcoap includes server and client capability. Available features include: * gcoap includes server and client capability. Available features include:
* *
* - Message Type: Supports non-confirmable (NON) messaging. Additionally * - Message Type: Supports non-confirmable (NON) messaging. Additionally
* provides a callback on timeout. * provides a callback on timeout. Provides piggybacked ACK response to a
* confirmable (CON) request.
* - Observe extension: Provides server-side registration and notifications. * - Observe extension: Provides server-side registration and notifications.
* - Server and Client provide helper functions for writing the * - Server and Client provide helper functions for writing the
* response/request. See the CoAP topic in the source documentation for * response/request. See the CoAP topic in the source documentation for

12
sys/net/application_layer/coap/gcoap.c
View File

@ -137,11 +137,18 @@ static void _listen(sock_udp_t *sock)
/* incoming request */ /* incoming request */
if (coap_get_code_class(&pdu) == COAP_CLASS_REQ) { if (coap_get_code_class(&pdu) == COAP_CLASS_REQ) {
if (coap_get_type(&pdu) == COAP_TYPE_NON
|| coap_get_type(&pdu) == COAP_TYPE_CON) {
size_t pdu_len = _handle_req(&pdu, buf, sizeof(buf), &remote); size_t pdu_len = _handle_req(&pdu, buf, sizeof(buf), &remote);
if (pdu_len > 0) { if (pdu_len > 0) {
sock_udp_send(sock, buf, pdu_len, &remote); sock_udp_send(sock, buf, pdu_len, &remote);
} }
} }
else {
DEBUG("gcoap: illegal request type: %u\n", coap_get_type(&pdu));
return;
}
}
/* incoming response */ /* incoming response */
else { else {
_find_req_memo(&memo, &pdu, buf, sizeof(buf)); _find_req_memo(&memo, &pdu, buf, sizeof(buf));
@ -730,9 +737,10 @@ size_t gcoap_req_send2(const uint8_t *buf, size_t len,
int gcoap_resp_init(coap_pkt_t *pdu, uint8_t *buf, size_t len, unsigned code) int gcoap_resp_init(coap_pkt_t *pdu, uint8_t *buf, size_t len, unsigned code)
{ {
/* Assume NON type request, so response type is the same. */ if (coap_get_type(pdu) == COAP_TYPE_CON) {
coap_hdr_set_type(pdu->hdr, COAP_TYPE_ACK);
}
coap_hdr_set_code(pdu->hdr, code); coap_hdr_set_code(pdu->hdr, code);
/* Create message ID since NON? */
/* Reserve some space between the header and payload to write options later */ /* Reserve some space between the header and payload to write options later */
pdu->payload = buf + coap_get_total_hdr_len(pdu) + GCOAP_RESP_OPTIONS_BUF; pdu->payload = buf + coap_get_total_hdr_len(pdu) + GCOAP_RESP_OPTIONS_BUF;