1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: protocol: remove the ->drain() function

Browse Source 
No protocol defines it anymore. The last user used to be the monitor-net
stuff that got partially broken already when the tcp_drain() function
moved to conn_sock_drain() with commit e215bba95 ("MINOR: connection:
make conn_sock_drain() work for all socket families") in 1.9-dev2.

A part of this will surely move back later when non-socket connections
arrive with QUIC but better keep the API clean and implement what's
needed in time instead.
This commit is contained in:
Willy Tarreau 2020-10-14 16:05:00 +02:00
parent 9e9919dd8b
commit e53e7ec9d9
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/protocol-t.h
View File

@ -106,7 +106,6 @@ struct protocol {
/* functions acting on connections */ /* functions acting on connections */
void (*accept)(int fd); /* generic accept function */ void (*accept)(int fd); /* generic accept function */
int (*connect)(struct connection *, int flags); /* connect function if any, see below for flags values */ int (*connect)(struct connection *, int flags); /* connect function if any, see below for flags values */
int (*drain)(int fd); /* indicates whether we can safely close the fd */
struct list receivers; /* list of receivers using this protocol (under proto_lock) */ struct list receivers; /* list of receivers using this protocol (under proto_lock) */
int nb_receivers; /* number of receivers (under proto_lock) */ int nb_receivers; /* number of receivers (under proto_lock) */

6
src/connection.c
View File

@ -420,12 +420,6 @@ int conn_sock_drain(struct connection *conn)
if (!fd_recv_ready(conn->handle.fd)) if (!fd_recv_ready(conn->handle.fd))
return 0; return 0;
if (conn->ctrl->drain) {
if (conn->ctrl->drain(conn->handle.fd) <= 0)
return 0;
goto shut;
}
/* no drain function defined, use the generic one */ /* no drain function defined, use the generic one */
while (turns) { while (turns) {