From ad6ffe5425d7befc5d6b03e77eab9381534d9706 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sun, 29 Jan 2023 11:57:37 +0100 Subject: [PATCH] Use file descriptor in sock_set_socket_timeout_micros() --- src/lib/sock.c | 8 ++++---- src/lib/sock.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/sock.c b/src/lib/sock.c index 275e819..4fafd8a 100644 --- a/src/lib/sock.c +++ b/src/lib/sock.c @@ -78,21 +78,21 @@ int sock_init(sock *s, int fd, int flags) { return 0; } -int sock_set_socket_timeout_micros(sock *s, long recv_micros, long send_micros) { +int sock_set_socket_timeout_micros(int fd, long recv_micros, long send_micros) { struct timeval recv_to = {.tv_sec = recv_micros / 1000000, .tv_usec = recv_micros % 1000000}, send_to = {.tv_sec = send_micros / 1000000, .tv_usec = send_micros % 1000000}; - if (setsockopt(s->socket, SOL_SOCKET, SO_RCVTIMEO, &recv_to, sizeof(recv_to)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &recv_to, sizeof(recv_to)) != 0) return -1; - if (setsockopt(s->socket, SOL_SOCKET, SO_SNDTIMEO, &send_to, sizeof(send_to)) != 0) + if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &send_to, sizeof(send_to)) != 0) return -1; return 0; } int sock_set_socket_timeout(sock *s, double sec) { - return sock_set_socket_timeout_micros(s, (long) (sec * 1000000L), (long) (sec * 1000000L)); + return sock_set_socket_timeout_micros(s->socket, (long) (sec * 1000000L), (long) (sec * 1000000L)); } int sock_set_timeout_micros(sock *s, long micros) { diff --git a/src/lib/sock.h b/src/lib/sock.h index 289df1e..db1ee9b 100644 --- a/src/lib/sock.h +++ b/src/lib/sock.h @@ -38,7 +38,7 @@ const char *sock_error_str(unsigned long err); int sock_init(sock *s, int fd, int enc); -int sock_set_socket_timeout_micros(sock *s, long recv_micros, long send_micros); +int sock_set_socket_timeout_micros(int fd, long recv_micros, long send_micros); int sock_set_socket_timeout(sock *s, double sec);