gcoap: make use of coap_get_token()

RIOT-OS · Apr 21, 2022 · 3d0c1d0 · 3d0c1d0
1 parent 328d462
commit 3d0c1d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sys/net/application_layer/gcoap/forward_proxy.c b/sys/net/application_layer/gcoap/forward_proxy.c
@@ -292,7 +292,7 @@ static int _gcoap_forward_proxy_via_coap(coap_pkt_t *client_pkt,
     pkt.hdr->id = client_pkt->hdr->id;
 
     if (token_len) {
-        memcpy(pkt.token, client_pkt->token, token_len);
+        memcpy(coap_get_token(&pkt), coap_get_token(client_pkt), token_len);
     }
 
     /* copy all options from client_pkt to pkt */

diff --git a/sys/net/application_layer/gcoap/gcoap.c b/sys/net/application_layer/gcoap/gcoap.c
@@ -608,7 +608,7 @@ static size_t _handle_req(gcoap_socket_t *sock, coap_pkt_t *pdu, uint8_t *buf,
             memo->token_len = coap_get_token_len(pdu);
             memo->socket = *sock;
             if (memo->token_len) {
-                memcpy(&memo->token[0], pdu->token, memo->token_len);
+                memcpy(&memo->token[0], coap_get_token(pdu), memo->token_len);
             }
             DEBUG("gcoap: Registered observer for: %s\n", memo->resource->path);
         }
@@ -803,7 +803,7 @@ static void _find_req_memo(gcoap_request_memo_t **memo_ptr, coap_pkt_t *src_pdu,
             }
         } else if (coap_get_token_len(memo_pdu) == cmplen) {
             memo_pdu->token = coap_hdr_data_ptr(memo_pdu->hdr);
-            if ((memcmp(src_pdu->token, memo_pdu->token, cmplen) == 0)
+            if ((memcmp(coap_get_token(src_pdu), memo_pdu->token, cmplen) == 0)
                     && sock_udp_ep_equal(&memo->remote_ep, remote)) {
                 *memo_ptr = memo;
                 break;