From: Willy Tarreau Date: Fri, 21 Feb 2020 09:24:51 +0000 (+0100) Subject: MINOR: tcp/uxst/sockpair: use fd_want_send() instead of conn_xprt_want_send() X-Git-Tag: v2.2-dev3~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=562e0d86199e42ee95e8c68b841e6354bff9450c;p=thirdparty%2Fhaproxy.git MINOR: tcp/uxst/sockpair: use fd_want_send() instead of conn_xprt_want_send() Just like previous commit, we don't need to pass through the connection layer anymore to enable polling during a connect(), we know the FD, so let's simply call fd_want_send(). --- diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c index bdc7ebee0f..75cdfd4979 100644 --- a/src/proto_sockpair.c +++ b/src/proto_sockpair.c @@ -332,7 +332,7 @@ static int sockpair_connect_server(struct connection *conn, int flags) return SF_ERR_RESOURCE; } - conn_xprt_want_send(conn); /* for connect status, proxy protocol or SSL */ + fd_want_send(fd); /* for connect status, proxy protocol or SSL */ return SF_ERR_NONE; /* connection is OK */ } diff --git a/src/proto_tcp.c b/src/proto_tcp.c index 8486863a2f..6f63e3f896 100644 --- a/src/proto_tcp.c +++ b/src/proto_tcp.c @@ -585,7 +585,7 @@ int tcp_connect_server(struct connection *conn, int flags) return SF_ERR_RESOURCE; } - conn_xprt_want_send(conn); /* for connect status, proxy protocol or SSL */ + fd_want_send(fd); /* for connect status, proxy protocol or SSL */ return SF_ERR_NONE; /* connection is OK */ } diff --git a/src/proto_uxst.c b/src/proto_uxst.c index 61c89d5457..2d5ac71bce 100644 --- a/src/proto_uxst.c +++ b/src/proto_uxst.c @@ -587,7 +587,7 @@ static int uxst_connect_server(struct connection *conn, int flags) return SF_ERR_RESOURCE; } - conn_xprt_want_send(conn); /* for connect status, proxy protocol or SSL */ + fd_want_send(fd); /* for connect status, proxy protocol or SSL */ return SF_ERR_NONE; /* connection is OK */ }