From c0bcff120ea33c8d0dd472bd25810f9bc3f8d393 Mon Sep 17 00:00:00 2001 From: Sjors Gielen Date: Thu, 29 Sep 2022 10:30:49 +0200 Subject: [PATCH] net: sntp: use zsock_ functions. Now the library does not need to depend on NET_SOCKETS_POSIX_NAMES. Signed-off-by: Sjors Gielen --- subsys/net/lib/sntp/Kconfig | 1 - subsys/net/lib/sntp/sntp.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/subsys/net/lib/sntp/Kconfig b/subsys/net/lib/sntp/Kconfig index 537b7e8ad3..b7f027b704 100644 --- a/subsys/net/lib/sntp/Kconfig +++ b/subsys/net/lib/sntp/Kconfig @@ -4,7 +4,6 @@ menuconfig SNTP bool "SNTP (Simple Network Time Protocol)" depends on NET_SOCKETS - depends on NET_SOCKETS_POSIX_NAMES || POSIX_API help Enable SNTP client library diff --git a/subsys/net/lib/sntp/sntp.c b/subsys/net/lib/sntp/sntp.c index 1a1aec3e3f..b85fbe877a 100644 --- a/subsys/net/lib/sntp/sntp.c +++ b/subsys/net/lib/sntp/sntp.c @@ -106,7 +106,7 @@ static int sntp_recv_response(struct sntp_ctx *sntp, uint32_t timeout, int status; int rcvd; - status = poll(sntp->sock.fds, sntp->sock.nfds, timeout); + status = zsock_poll(sntp->sock.fds, sntp->sock.nfds, timeout); if (status < 0) { NET_ERR("Error in poll:%d", errno); return -errno; @@ -116,7 +116,7 @@ static int sntp_recv_response(struct sntp_ctx *sntp, uint32_t timeout, return -ETIMEDOUT; } - rcvd = recv(sntp->sock.fd, (uint8_t *)&buf, sizeof(buf), 0); + rcvd = zsock_recv(sntp->sock.fd, (uint8_t *)&buf, sizeof(buf), 0); if (rcvd < 0) { return -errno; } @@ -150,15 +150,15 @@ int sntp_init(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len) memset(ctx, 0, sizeof(struct sntp_ctx)); - ctx->sock.fd = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP); + ctx->sock.fd = zsock_socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP); if (ctx->sock.fd < 0) { NET_ERR("Failed to create UDP socket %d", errno); return -errno; } - ret = connect(ctx->sock.fd, addr, addr_len); + ret = zsock_connect(ctx->sock.fd, addr, addr_len); if (ret < 0) { - (void)close(ctx->sock.fd); + (void)zsock_close(ctx->sock.fd); NET_ERR("Cannot connect to UDP remote : %d", errno); return -errno; } @@ -186,7 +186,7 @@ int sntp_query(struct sntp_ctx *ctx, uint32_t timeout, struct sntp_time *time) ctx->expected_orig_ts = get_uptime_in_sec() + OFFSET_1970_JAN_1; tx_pkt.tx_tm_s = htonl(ctx->expected_orig_ts); - ret = send(ctx->sock.fd, (uint8_t *)&tx_pkt, sizeof(tx_pkt), 0); + ret = zsock_send(ctx->sock.fd, (uint8_t *)&tx_pkt, sizeof(tx_pkt), 0); if (ret < 0) { NET_ERR("Failed to send over UDP socket %d", ret); return ret; @@ -198,6 +198,6 @@ int sntp_query(struct sntp_ctx *ctx, uint32_t timeout, struct sntp_time *time) void sntp_close(struct sntp_ctx *ctx) { if (ctx) { - (void)close(ctx->sock.fd); + (void)zsock_close(ctx->sock.fd); } }