examples/gcoap: upgrade users of deprecated nanocoap APIs

maribu · maribu · commit ea5d5444129b · 2025-04-09T20:20:42.000+02:00
diff --git a/examples/networking/coap/gcoap/client.c b/examples/networking/coap/gcoap/client.c
@@ -134,16 +134,16 @@ static void _resp_handler(const gcoap_request_memo_t *memo, coap_pkt_t* pdu,
             uri_parser_result_t urip;
             uri_parser_process(&urip, _last_req_uri, strlen(_last_req_uri));
             if (*_proxy_uri) {
-                gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,
+                gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,
                                COAP_METHOD_GET, NULL);
             }
             else {
-                gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,
+                gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,
                                COAP_METHOD_GET, urip.path);
             }
 
             if (msg_type == COAP_TYPE_ACK) {
-                coap_hdr_set_type(pdu->hdr, COAP_TYPE_CON);
+                coap_pkt_set_type(pdu, COAP_TYPE_CON);
             }
             block.blknum++;
             coap_opt_add_block2_control(pdu, &block);
@@ -154,7 +154,7 @@ static void _resp_handler(const gcoap_request_memo_t *memo, coap_pkt_t* pdu,
 
             int len = coap_opt_finish(pdu, COAP_OPT_FINISH_NONE);
             gcoap_socket_type_t tl = _get_tl(*_proxy_uri ? _proxy_uri : _last_req_uri);
-            _send((uint8_t *)pdu->hdr, len, remote, memo->context, tl);
+            _send(pdu->buf, len, remote, memo->context, tl);
         }
         else {
             puts("--- blockwise complete ---");
@@ -341,7 +341,7 @@ static int _cli_cmd(int argc, char **argv)
             }
         }
 
-        coap_hdr_set_type(pdu.hdr, msg_type);
+        coap_pkt_set_type(&pdu, msg_type);
 
         size_t paylen = 0;
         if (apos < argc) {
diff --git a/examples/networking/coap/gcoap/server.c b/examples/networking/coap/gcoap/server.c
@@ -123,7 +123,7 @@ static void _rtc_notify_observers(void *arg)
     }
     size_t len;
     char str_time[20] = "";
-    uint8_t buf[sizeof(coap_hdr_t) + COAP_TOKEN_LENGTH_MAX + 1 + sizeof(str_time)];
+    uint8_t buf[sizeof(coap_udp_hdr_t) + COAP_TOKEN_LENGTH_MAX + 1 + sizeof(str_time)];
     coap_pkt_t pdu;
     const coap_resource_t *rtc_resource = NULL;
     const gcoap_listener_t *listener = NULL;
diff --git a/examples/networking/coap/gcoap_dtls/client.c b/examples/networking/coap/gcoap_dtls/client.c
@@ -133,16 +133,16 @@ static void _resp_handler(const gcoap_request_memo_t *memo, coap_pkt_t* pdu,
             uri_parser_result_t urip;
             uri_parser_process(&urip, _last_req_uri, strlen(_last_req_uri));
             if (*_proxy_uri) {
-                gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,
+                gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,
                                COAP_METHOD_GET, NULL);
             }
             else {
-                gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,
+                gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,
                                COAP_METHOD_GET, urip.path);
             }
 
             if (msg_type == COAP_TYPE_ACK) {
-                coap_hdr_set_type(pdu->hdr, COAP_TYPE_CON);
+                coap_pkt_set_type(pdu, COAP_TYPE_CON);
             }
             block.blknum++;
             coap_opt_add_block2_control(pdu, &block);
@@ -153,7 +153,7 @@ static void _resp_handler(const gcoap_request_memo_t *memo, coap_pkt_t* pdu,
 
             int len = coap_opt_finish(pdu, COAP_OPT_FINISH_NONE);
             gcoap_socket_type_t tl = _get_tl(*_proxy_uri ? _proxy_uri : _last_req_uri);
-            _send((uint8_t *)pdu->hdr, len, remote, memo->context, tl);
+            _send(pdu->buf, len, remote, memo->context, tl);
         }
         else {
             puts("--- blockwise complete ---");
@@ -340,7 +340,7 @@ int gcoap_cli_cmd(int argc, char **argv)
             }
         }
 
-        coap_hdr_set_type(pdu.hdr, msg_type);
+        coap_pkt_set_type(&pdu, msg_type);
 
         size_t paylen = 0;
         if (apos < argc) {

Original file line number	Diff line number	Diff line change
`@@ -134,16 +134,16 @@ static void _resp_handler(const gcoap_request_memo_t memo, coap_pkt_t pdu,`
`134`	`134`	`uri_parser_result_t urip;`
`135`	`135`	`uri_parser_process(&urip, _last_req_uri, strlen(_last_req_uri));`
`136`	`136`	`if (*_proxy_uri) {`
`137`		`- gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,`
	`137`	`+ gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,`
`138`	`138`	`COAP_METHOD_GET, NULL);`
`139`	`139`	`}`
`140`	`140`	`else {`
`141`		`- gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,`
	`141`	`+ gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,`
`142`	`142`	`COAP_METHOD_GET, urip.path);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`if (msg_type == COAP_TYPE_ACK) {`
`146`		`- coap_hdr_set_type(pdu->hdr, COAP_TYPE_CON);`
	`146`	`+ coap_pkt_set_type(pdu, COAP_TYPE_CON);`
`147`	`147`	`}`
`148`	`148`	`block.blknum++;`
`149`	`149`	`coap_opt_add_block2_control(pdu, &block);`
`@@ -154,7 +154,7 @@ static void _resp_handler(const gcoap_request_memo_t memo, coap_pkt_t pdu,`
`154`	`154`
`155`	`155`	`int len = coap_opt_finish(pdu, COAP_OPT_FINISH_NONE);`
`156`	`156`	`gcoap_socket_type_t tl = _get_tl(*_proxy_uri ? _proxy_uri : _last_req_uri);`
`157`		`- _send((uint8_t *)pdu->hdr, len, remote, memo->context, tl);`
	`157`	`+ _send(pdu->buf, len, remote, memo->context, tl);`
`158`	`158`	`}`
`159`	`159`	`else {`
`160`	`160`	`puts("--- blockwise complete ---");`
`@@ -341,7 +341,7 @@ static int _cli_cmd(int argc, char **argv)`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`344`		`- coap_hdr_set_type(pdu.hdr, msg_type);`
	`344`	`+ coap_pkt_set_type(&pdu, msg_type);`
`345`	`345`
`346`	`346`	`size_t paylen = 0;`
`347`	`347`	`if (apos < argc) {`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ static void _rtc_notify_observers(void *arg)`
`123`	`123`	`}`
`124`	`124`	`size_t len;`
`125`	`125`	`char str_time[20] = "";`
`126`		`- uint8_t buf[sizeof(coap_hdr_t) + COAP_TOKEN_LENGTH_MAX + 1 + sizeof(str_time)];`
	`126`	`+ uint8_t buf[sizeof(coap_udp_hdr_t) + COAP_TOKEN_LENGTH_MAX + 1 + sizeof(str_time)];`
`127`	`127`	`coap_pkt_t pdu;`
`128`	`128`	`const coap_resource_t *rtc_resource = NULL;`
`129`	`129`	`const gcoap_listener_t *listener = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -133,16 +133,16 @@ static void _resp_handler(const gcoap_request_memo_t memo, coap_pkt_t pdu,`
`133`	`133`	`uri_parser_result_t urip;`
`134`	`134`	`uri_parser_process(&urip, _last_req_uri, strlen(_last_req_uri));`
`135`	`135`	`if (*_proxy_uri) {`
`136`		`- gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,`
	`136`	`+ gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,`
`137`	`137`	`COAP_METHOD_GET, NULL);`
`138`	`138`	`}`
`139`	`139`	`else {`
`140`		`- gcoap_req_init(pdu, (uint8_t *)pdu->hdr, CONFIG_GCOAP_PDU_BUF_SIZE,`
	`140`	`+ gcoap_req_init(pdu, pdu->buf, CONFIG_GCOAP_PDU_BUF_SIZE,`
`141`	`141`	`COAP_METHOD_GET, urip.path);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`if (msg_type == COAP_TYPE_ACK) {`
`145`		`- coap_hdr_set_type(pdu->hdr, COAP_TYPE_CON);`
	`145`	`+ coap_pkt_set_type(pdu, COAP_TYPE_CON);`
`146`	`146`	`}`
`147`	`147`	`block.blknum++;`
`148`	`148`	`coap_opt_add_block2_control(pdu, &block);`
`@@ -153,7 +153,7 @@ static void _resp_handler(const gcoap_request_memo_t memo, coap_pkt_t pdu,`
`153`	`153`
`154`	`154`	`int len = coap_opt_finish(pdu, COAP_OPT_FINISH_NONE);`
`155`	`155`	`gcoap_socket_type_t tl = _get_tl(*_proxy_uri ? _proxy_uri : _last_req_uri);`
`156`		`- _send((uint8_t *)pdu->hdr, len, remote, memo->context, tl);`
	`156`	`+ _send(pdu->buf, len, remote, memo->context, tl);`
`157`	`157`	`}`
`158`	`158`	`else {`
`159`	`159`	`puts("--- blockwise complete ---");`
`@@ -340,7 +340,7 @@ int gcoap_cli_cmd(int argc, char **argv)`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
`343`		`- coap_hdr_set_type(pdu.hdr, msg_type);`
	`343`	`+ coap_pkt_set_type(&pdu, msg_type);`
`344`	`344`
`345`	`345`	`size_t paylen = 0;`
`346`	`346`	`if (apos < argc) {`