mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 23:01:03 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: tcp: make use of sock_accept_conn() where relevant

Browse Source 
This allows to get rid of two getsockopt(SO_ACCEPTCONN).
This commit is contained in:
Willy Tarreau 2020-10-13 17:42:21 +02:00
parent cc8b653483
commit 3e12de2cc6
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/proto_tcp.c
View File

@ -570,7 +570,6 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
{ {
int fd, err; int fd, err;
int ready; int ready;
socklen_t ready_len;
char *msg = NULL; char *msg = NULL;
err = ERR_NONE; err = ERR_NONE;
@ -678,10 +677,8 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
} }
} }
#endif #endif
ready = 0;
ready_len = sizeof(ready); ready = sock_accept_conn(&listener->rx) > 0;
if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &ready, &ready_len) == -1)
ready = 0;
if (!ready && /* only listen if not already done by external process */ if (!ready && /* only listen if not already done by external process */
listen(fd, listener_backlog(listener)) == -1) { listen(fd, listener_backlog(listener)) == -1) {
@ -772,8 +769,8 @@ static void tcp_disable_listener(struct listener *l)
*/ */
static int tcp_suspend_receiver(struct receiver *rx) static int tcp_suspend_receiver(struct receiver *rx)
{ {
socklen_t opt_val, opt_len;
struct sockaddr sa; struct sockaddr sa;
int ret;
sa.sa_family = AF_UNSPEC; sa.sa_family = AF_UNSPEC;
if (connect(rx->fd, &sa, sizeof(sa)) < 0) if (connect(rx->fd, &sa, sizeof(sa)) < 0)
@ -787,19 +784,14 @@ static int tcp_suspend_receiver(struct receiver *rx)
* dealing with a socket that is shared with other processes doing the * dealing with a socket that is shared with other processes doing the
* same. Let's check if it's still accepting connections. * same. Let's check if it's still accepting connections.
*/ */
opt_val = 0; ret = sock_accept_conn(rx);
opt_len = sizeof(opt_val); if (ret <= 0) {
if (getsockopt(rx->fd, SOL_SOCKET, SO_ACCEPTCONN, &opt_val, &opt_len) == -1) { /* unrecoverable or paused by another process */
fd_stop_recv(rx->fd); fd_stop_recv(rx->fd);
return 0; /* the socket is really unrecoverable */ return ret == 0;
} }
if (!opt_val) { /* still listening, that's not good */
fd_stop_recv(rx->fd);
return 1; /* already paused by another process */
}
/* something looks fishy here */
return -1; return -1;
} }