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

Merge pull request #7407 from haukepetersen/opt_gcoap_passudpeponresp

Browse Source 
net/gcoap: added remote sock ep to resp handler cb
This commit is contained in:
Martine Lenders 2017-07-31 12:05:57 +02:00 committed by GitHub
commit ef9007b56c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/gcoap/gcoap_cli.c
View File

@ -29,7 +29,8 @@
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
#include "debug.h" #include "debug.h"
static void _resp_handler(unsigned req_state, coap_pkt_t* pdu); static void _resp_handler(unsigned req_state, coap_pkt_t* pdu,
sock_udp_ep_t *remote);
static ssize_t _stats_handler(coap_pkt_t* pdu, uint8_t *buf, size_t len); static ssize_t _stats_handler(coap_pkt_t* pdu, uint8_t *buf, size_t len);
/* CoAP resources */ /* CoAP resources */
@ -48,8 +49,11 @@ static uint16_t req_count = 0;
/* /*
* Response callback. * Response callback.
*/ */
static void _resp_handler(unsigned req_state, coap_pkt_t* pdu) static void _resp_handler(unsigned req_state, coap_pkt_t* pdu,
sock_udp_ep_t *remote)
{ {
(void)remote; /* not interested in the source currently */
if (req_state == GCOAP_MEMO_TIMEOUT) { if (req_state == GCOAP_MEMO_TIMEOUT) {
printf("gcoap: timeout for msg ID %02u\n", coap_get_id(pdu)); printf("gcoap: timeout for msg ID %02u\n", coap_get_id(pdu));
return; return;

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

@ -413,7 +413,8 @@ typedef struct gcoap_listener {
* *
* If request timed out, the packet header is for the request. * If request timed out, the packet header is for the request.
*/ */
typedef void (*gcoap_resp_handler_t)(unsigned req_state, coap_pkt_t* pdu); typedef void (*gcoap_resp_handler_t)(unsigned req_state, coap_pkt_t* pdu,
sock_udp_ep_t *remote);
/** /**
* @brief Memo to handle a response for a request * @brief Memo to handle a response for a request

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

@ -160,7 +160,7 @@ static void _listen(sock_udp_t *sock)
if (memo) { if (memo) {
xtimer_remove(&memo->response_timer); xtimer_remove(&memo->response_timer);
memo->state = GCOAP_MEMO_RESP; memo->state = GCOAP_MEMO_RESP;
memo->resp_handler(memo->state, &pdu); memo->resp_handler(memo->state, &pdu, &remote);
memo->state = GCOAP_MEMO_UNUSED; memo->state = GCOAP_MEMO_UNUSED;
} }
} }
@ -380,7 +380,7 @@ static void _expire_request(gcoap_request_memo_t *memo)
/* Pass response to handler */ /* Pass response to handler */
if (memo->resp_handler) { if (memo->resp_handler) {
req.hdr = (coap_hdr_t *)&memo->hdr_buf[0]; /* for reference */ req.hdr = (coap_hdr_t *)&memo->hdr_buf[0]; /* for reference */
memo->resp_handler(memo->state, &req); memo->resp_handler(memo->state, &req, NULL);
} }
memo->state = GCOAP_MEMO_UNUSED; memo->state = GCOAP_MEMO_UNUSED;
} }