lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Use file descriptor in sock_set_socket_timeout_micros()

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-29 11:57:37 +01:00
parent ab7e5cc722
commit ad6ffe5425
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/sock.c
View File

@ -78,21 +78,21 @@ int sock_init(sock *s, int fd, int flags) {
return 0; 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}, 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}; 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; 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 -1;
return 0; return 0;
} }
int sock_set_socket_timeout(sock *s, double sec) { 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) { int sock_set_timeout_micros(sock *s, long micros) {

2
src/lib/sock.h
View File

@ -38,7 +38,7 @@ const char *sock_error_str(unsigned long err);
int sock_init(sock *s, int fd, int enc); 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); int sock_set_socket_timeout(sock *s, double sec);