RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MAJOR: stream-int: handle the connection reuse in si_connect() 

This is the best place to reuse a connection. We centralize all
connection requests and we're at the best place to know exactly
what the current state of the underlying connection is. If the
connection is reused, we just enable polling for send() in order
to be able to emit the request.
This commit is contained in:
Willy Tarreau 2013-12-15 16:20:50 +01:00
parent 9471b8ced9
commit b490b4e5ad
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/proto/stream_interface.h
View File

@ -298,14 +298,22 @@ static inline void si_chk_snd(struct stream_interface *si)
static inline int si_connect(struct stream_interface *si)
{
struct connection *conn = objt_conn(si->end);
int ret;
int ret = SN_ERR_NONE;
if (unlikely(!conn || !conn->ctrl || !conn->ctrl->connect))
return SN_ERR_INTERNAL;
ret = conn->ctrl->connect(conn, !channel_is_empty(si->ob), 0);
if (ret != SN_ERR_NONE)
return ret;
if (!conn_ctrl_ready(conn) || !conn_xprt_ready(conn)) {
ret = conn->ctrl->connect(conn, !channel_is_empty(si->ob), 0);
if (ret != SN_ERR_NONE)
return ret;
}
else if (!channel_is_empty(si->ob)) {
/* reuse the existing connection, we'll have to send a
* request there.
*/
conn_data_want_send(conn);
}
/* needs src ip/port for logging */
if (si->flags & SI_FL_SRC_ADDR)