mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: rearrange tcp_connect_probe() and fix wrong return codes

Browse Source 
Sometimes we returned the need for polling while it was not needed. Remove
some of the spaghetti in the function.
This commit is contained in:
Willy Tarreau 2012-07-23 20:05:00 +02:00 committed by Willy Tarreau
parent 8f8c92fe93
commit 0b0c097a3a
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/proto_tcp.c
View File

@ -527,13 +527,12 @@ int tcp_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir)
int tcp_connect_probe(struct connection *conn) int tcp_connect_probe(struct connection *conn)
{ {
int fd = conn->t.sock.fd; int fd = conn->t.sock.fd;
int retval = 0;
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
goto out_error; return 1;
if (!(conn->flags & CO_FL_WAIT_L4_CONN)) if (!(conn->flags & CO_FL_WAIT_L4_CONN))
goto out_ignore; /* strange we were called while ready */ return 1; /* strange we were called while ready */
/* stop here if we reached the end of data */ /* stop here if we reached the end of data */
if ((fdtab[fd].ev & (FD_POLL_IN|FD_POLL_HUP)) == FD_POLL_HUP) if ((fdtab[fd].ev & (FD_POLL_IN|FD_POLL_HUP)) == FD_POLL_HUP)
@ -550,7 +549,7 @@ int tcp_connect_probe(struct connection *conn)
*/ */
if ((connect(fd, conn->peeraddr, conn->peerlen) < 0)) { if ((connect(fd, conn->peeraddr, conn->peerlen) < 0)) {
if (errno == EALREADY || errno == EINPROGRESS) if (errno == EALREADY || errno == EINPROGRESS)
goto out_ignore; return 0;
if (errno && errno != EISCONN) if (errno && errno != EISCONN)
goto out_error; goto out_error;
@ -563,23 +562,16 @@ int tcp_connect_probe(struct connection *conn)
* interface flags. * interface flags.
*/ */
conn->flags &= ~CO_FL_WAIT_L4_CONN; conn->flags &= ~CO_FL_WAIT_L4_CONN;
return 1;
out_wakeup:
out_ignore:
return retval;
out_error: out_error:
/* Write error on the file descriptor. We mark the FD as STERROR so /* Write error on the file descriptor. Report it to the connection
* that we don't use it anymore. The error is reported to the stream * and disable polling on this FD.
* interface which will take proper action. We must not perturbate the
* buffer because the stream interface wants to ensure transparent
* connection retries.
*/ */
conn->flags |= CO_FL_ERROR; conn->flags |= CO_FL_ERROR;
EV_FD_REM(fd); EV_FD_REM(fd);
retval = 1; return 1;
goto out_wakeup;
} }