From b6fac2b2c763f96f95588c20200788ccc41b08c7 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 13 Sep 2022 19:33:41 +0200 Subject: [PATCH] nanocoap_sock: consitfy remote --- sys/include/net/nanocoap_sock.h | 18 +++++++++++------- sys/net/application_layer/nanocoap/sock.c | 19 +++++++------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/include/net/nanocoap_sock.h b/sys/include/net/nanocoap_sock.h index 9fed27df04..077dde7170 100644 --- a/sys/include/net/nanocoap_sock.h +++ b/sys/include/net/nanocoap_sock.h @@ -181,8 +181,12 @@ int nanocoap_server(sock_udp_ep_t *local, uint8_t *buf, size_t bufsize); * @returns 0 on success * @returns <0 on error */ -int nanocoap_sock_connect(nanocoap_sock_t *sock, sock_udp_ep_t *local, - sock_udp_ep_t *remote); +static inline int nanocoap_sock_connect(nanocoap_sock_t *sock, + const sock_udp_ep_t *local, + const sock_udp_ep_t *remote) +{ + return sock_udp_create(sock, local, remote, 0); +} /** * @brief Create a CoAP client socket by URL @@ -362,8 +366,8 @@ ssize_t nanocoap_sock_request_cb(sock_udp_t *sock, coap_pkt_t *pkt, * @returns length of response on success * @returns <0 on error */ -ssize_t nanocoap_request(coap_pkt_t *pkt, sock_udp_ep_t *local, - sock_udp_ep_t *remote, size_t len); +ssize_t nanocoap_request(coap_pkt_t *pkt, const sock_udp_ep_t *local, + const sock_udp_ep_t *remote, size_t len); /** * @brief Simple synchronous CoAP (confirmable) get @@ -376,8 +380,8 @@ ssize_t nanocoap_request(coap_pkt_t *pkt, sock_udp_ep_t *local, * @returns length of response payload on success * @returns <0 on error */ -ssize_t nanocoap_get(sock_udp_ep_t *remote, const char *path, void *buf, - size_t len); +ssize_t nanocoap_get(const sock_udp_ep_t *remote, const char *path, + void *buf, size_t len); /** * @brief Initialize block request context @@ -392,7 +396,7 @@ ssize_t nanocoap_get(sock_udp_ep_t *remote, const char *path, void *buf, * @retval <0 Error (see @ref nanocoap_sock_connect for details) */ static inline int nanocoap_block_request_init(coap_block_request_t *ctx, - sock_udp_ep_t *remote, + const sock_udp_ep_t *remote, const char *path, uint8_t method, coap_blksize_t blksize) diff --git a/sys/net/application_layer/nanocoap/sock.c b/sys/net/application_layer/nanocoap/sock.c index b3c05c410c..2d81c0b099 100644 --- a/sys/net/application_layer/nanocoap/sock.c +++ b/sys/net/application_layer/nanocoap/sock.c @@ -56,15 +56,6 @@ static uint16_t _get_id(void) return atomic_fetch_add_u16(&id, 1); } -int nanocoap_sock_connect(nanocoap_sock_t *sock, sock_udp_ep_t *local, sock_udp_ep_t *remote) -{ - if (!remote->port) { - remote->port = COAP_PORT; - } - - return sock_udp_create(sock, local, remote, 0); -} - static int _get_error(const coap_pkt_t *pkt) { switch (coap_get_code_class(pkt)) { @@ -370,8 +361,8 @@ ssize_t nanocoap_sock_post(nanocoap_sock_t *sock, const char *path, return _sock_put_post(sock, path, COAP_METHOD_POST, request, len, response, len_max); } -ssize_t nanocoap_request(coap_pkt_t *pkt, sock_udp_ep_t *local, - sock_udp_ep_t *remote, size_t len) +ssize_t nanocoap_request(coap_pkt_t *pkt, const sock_udp_ep_t *local, + const sock_udp_ep_t *remote, size_t len) { int res; nanocoap_sock_t sock; @@ -387,7 +378,7 @@ ssize_t nanocoap_request(coap_pkt_t *pkt, sock_udp_ep_t *local, return res; } -ssize_t nanocoap_get(sock_udp_ep_t *remote, const char *path, void *buf, size_t len) +ssize_t nanocoap_get(const sock_udp_ep_t *remote, const char *path, void *buf, size_t len) { int res; nanocoap_sock_t sock; @@ -539,6 +530,10 @@ int nanocoap_sock_url_connect(const char *url, nanocoap_sock_t *sock) return -EINVAL; } + if (!remote.port) { + remote.port = COAP_PORT; + } + return nanocoap_sock_connect(sock, NULL, &remote); }