kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 10:03:50 +01:00
Code Releases Activity

nanocoap_sock: consitfy remote

Browse Source
This commit is contained in:
Benjamin Valentin 2022-09-13 19:33:41 +02:00
parent a594e90228
commit b6fac2b2c7
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/include/net/nanocoap_sock.h
View File

@ -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 success
* @returns <0 on error * @returns <0 on error
*/ */
int nanocoap_sock_connect(nanocoap_sock_t *sock, sock_udp_ep_t *local, static inline int nanocoap_sock_connect(nanocoap_sock_t *sock,
sock_udp_ep_t *remote); 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 * @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 length of response on success
* @returns <0 on error * @returns <0 on error
*/ */
ssize_t nanocoap_request(coap_pkt_t *pkt, sock_udp_ep_t *local, ssize_t nanocoap_request(coap_pkt_t *pkt, const sock_udp_ep_t *local,
sock_udp_ep_t *remote, size_t len); const sock_udp_ep_t *remote, size_t len);
/** /**
* @brief Simple synchronous CoAP (confirmable) get * @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 length of response payload on success
* @returns <0 on error * @returns <0 on error
*/ */
ssize_t nanocoap_get(sock_udp_ep_t *remote, const char *path, void *buf, ssize_t nanocoap_get(const sock_udp_ep_t *remote, const char *path,
size_t len); void *buf, size_t len);
/** /**
* @brief Initialize block request context * @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) * @retval <0 Error (see @ref nanocoap_sock_connect for details)
*/ */
static inline int nanocoap_block_request_init(coap_block_request_t *ctx, 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, const char *path,
uint8_t method, uint8_t method,
coap_blksize_t blksize) coap_blksize_t blksize)

19
sys/net/application_layer/nanocoap/sock.c
View File

@ -56,15 +56,6 @@ static uint16_t _get_id(void)
return atomic_fetch_add_u16(&id, 1); 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) static int _get_error(const coap_pkt_t *pkt)
{ {
switch (coap_get_code_class(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); 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, ssize_t nanocoap_request(coap_pkt_t *pkt, const sock_udp_ep_t *local,
sock_udp_ep_t *remote, size_t len) const sock_udp_ep_t *remote, size_t len)
{ {
int res; int res;
nanocoap_sock_t sock; nanocoap_sock_t sock;
@ -387,7 +378,7 @@ ssize_t nanocoap_request(coap_pkt_t *pkt, sock_udp_ep_t *local,
return res; 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; int res;
nanocoap_sock_t sock; nanocoap_sock_t sock;
@ -539,6 +530,10 @@ int nanocoap_sock_url_connect(const char *url, nanocoap_sock_t *sock)
return -EINVAL; return -EINVAL;
} }
if (!remote.port) {
remote.port = COAP_PORT;
}
return nanocoap_sock_connect(sock, NULL, &remote); return nanocoap_sock_connect(sock, NULL, &remote);
} }