From fc9538fa6dd12df04d836426722c05c79c6475ff Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Mon, 2 Jan 2023 19:48:57 +0100 Subject: [PATCH] Update sock_check to sock_has_pending --- src/async.c | 2 +- src/lib/proxy.c | 2 +- src/lib/sock.c | 4 ++-- src/lib/sock.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/async.c b/src/async.c index b5d9d19..706b9b2 100644 --- a/src/async.c +++ b/src/async.c @@ -58,7 +58,7 @@ static int async_exec(evt_listen_t *evt, short r_events) { int ret, e = errno; if (r_events & evt->events) { // specified event(s) occurred - if (evt->socket && !sock_check(evt->socket)) { + if (evt->socket && !sock_has_pending(evt->socket)) { evt->err_cb(evt->err_arg); ret = 0; } else { diff --git a/src/lib/proxy.c b/src/lib/proxy.c index 5f61705..651cfd7 100644 --- a/src/lib/proxy.c +++ b/src/lib/proxy.c @@ -226,7 +226,7 @@ proxy_ctx_t *proxy_init(http_req *req, http_res *res, http_status_ctx *ctx, host proxy_ctx_t *proxy = proxy_get_by_conf(conf); proxy->in_use = 1; - if (proxy->initialized && sock_check(&proxy->proxy) == 0) + if (proxy->initialized && sock_has_pending(&proxy->proxy) == 0) goto proxy; retry: diff --git a/src/lib/sock.c b/src/lib/sock.c index b7e49df..62472d5 100644 --- a/src/lib/sock.c +++ b/src/lib/sock.c @@ -151,8 +151,8 @@ int sock_close(sock *s) { return 0; } -int sock_check(sock *s) { - char buf; +int sock_has_pending(sock *s) { + char buf[1]; int e = errno; long ret = sock_recv(s, &buf, 1, MSG_PEEK | MSG_DONTWAIT); errno = e; diff --git a/src/lib/sock.h b/src/lib/sock.h index bf256ed..8603e3f 100644 --- a/src/lib/sock.h +++ b/src/lib/sock.h @@ -46,7 +46,7 @@ long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len) int sock_close(sock *s); -int sock_check(sock *s); +int sock_has_pending(sock *s); int sock_poll(sock *sockets[], sock *ready[], sock *error[], int n_sock, int *n_ready, int *n_error, short events, int timeout_ms);