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 #20933 from benpicco/sys/net/application_layer/gcoap-ipv4

Browse Source 
gcoap: fix build with IPv4
This commit is contained in:
mguetschow 2024-10-24 09:28:23 +00:00 committed by GitHub
commit fbde0209d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,11 +958,19 @@ static gcoap_request_memo_t* _find_req_memo_by_token(const sock_udp_ep_t *remote
memo_pdu->hdr = gcoap_request_memo_get_hdr(memo); memo_pdu->hdr = gcoap_request_memo_get_hdr(memo);
/* verbose debug to catch bugs with request/response matching */ /* verbose debug to catch bugs with request/response matching */
#if SOCK_HAS_IPV4
DEBUG("Seeking memo for remote=%s, tkn=0x%02x%02x%02x%02x%02x%02x%02x%02x, tkl=%"PRIuSIZE"\n",
ipv4_addr_to_str(_ipv6_addr_str, (ipv4_addr_t *)&remote->addr.ipv4,
IPV6_ADDR_MAX_STR_LEN),
token[0], token[1], token[2], token[3], token[4], token[5], token[6], token[7],
tkl);
#else
DEBUG("Seeking memo for remote=%s, tkn=0x%02x%02x%02x%02x%02x%02x%02x%02x, tkl=%"PRIuSIZE"\n", DEBUG("Seeking memo for remote=%s, tkn=0x%02x%02x%02x%02x%02x%02x%02x%02x, tkl=%"PRIuSIZE"\n",
ipv6_addr_to_str(_ipv6_addr_str, (ipv6_addr_t *)&remote->addr.ipv6, ipv6_addr_to_str(_ipv6_addr_str, (ipv6_addr_t *)&remote->addr.ipv6,
IPV6_ADDR_MAX_STR_LEN), IPV6_ADDR_MAX_STR_LEN),
token[0], token[1], token[2], token[3], token[4], token[5], token[6], token[7], token[0], token[1], token[2], token[3], token[4], token[5], token[6], token[7],
tkl); tkl);
#endif
if (coap_get_token_len(memo_pdu) != tkl) { if (coap_get_token_len(memo_pdu) != tkl) {
DEBUG("Token length mismatch %u\n", coap_get_token_len(memo_pdu)); DEBUG("Token length mismatch %u\n", coap_get_token_len(memo_pdu));
@ -980,9 +988,15 @@ static gcoap_request_memo_t* _find_req_memo_by_token(const sock_udp_ep_t *remote
DEBUG("matching multicast response\n"); DEBUG("matching multicast response\n");
} }
else { else {
#if SOCK_HAS_IPV4
DEBUG("Remote address mismatch %s\n",
ipv4_addr_to_str(_ipv6_addr_str, (ipv4_addr_t *)&memo->remote_ep.addr.ipv4,
IPV6_ADDR_MAX_STR_LEN));
#else
DEBUG("Remote address mismatch %s\n", DEBUG("Remote address mismatch %s\n",
ipv6_addr_to_str(_ipv6_addr_str, (ipv6_addr_t *)&memo->remote_ep.addr.ipv6, ipv6_addr_to_str(_ipv6_addr_str, (ipv6_addr_t *)&memo->remote_ep.addr.ipv6,
IPV6_ADDR_MAX_STR_LEN)); IPV6_ADDR_MAX_STR_LEN));
#endif
continue; continue;
} }
} }