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

Merge pull request #8800 from haukepetersen/opt_gcoap_noresponsehandler

Browse Source 
net/gcoap: allow to not define a response handler
This commit is contained in:
Ken Bannister 2018-03-19 14:57:56 +00:00 committed by GitHub
commit b8e88703ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -574,7 +574,7 @@ static inline ssize_t gcoap_request(coap_pkt_t *pdu, uint8_t *buf, size_t len,
* @param[in] buf Buffer containing the PDU
* @param[in] len Length of the buffer
* @param[in] remote Destination for the packet
* @param[in] resp_handler Callback when response received
* @param[in] resp_handler Callback when response received, may be NULL
*
* @return length of the packet
* @return 0 if cannot send
@ -592,7 +592,7 @@ size_t gcoap_req_send2(const uint8_t *buf, size_t len,
* @param[in] len Length of the buffer
* @param[in] addr Destination for the packet
* @param[in] port Port at the destination
* @param[in] resp_handler Callback when response received
* @param[in] resp_handler Callback when response received, may be NULL
*
* @return length of the packet
* @return 0 if cannot send

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

@ -200,7 +200,9 @@ static void _listen(sock_udp_t *sock)
case COAP_TYPE_ACK:
xtimer_remove(&memo->response_timer);
memo->state = GCOAP_MEMO_RESP;
memo->resp_handler(memo->state, &pdu, &remote);
if (memo->resp_handler) {
memo->resp_handler(memo->state, &pdu, &remote);
}
if (memo->send_limit >= 0) { /* if confirmable */
*memo->msg.data.pdu_buf = 0; /* clear resend PDU buffer */
@ -749,7 +751,6 @@ size_t gcoap_req_send2(const uint8_t *buf, size_t len,
{
gcoap_request_memo_t *memo = NULL;
assert(remote != NULL);
assert(resp_handler != NULL);
/* Find empty slot in list of open requests. */
mutex_lock(&_coap_state.lock);