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

MAJOR: connection: add a new CO_FL_CONNECTED flag

Browse Source 
This new flag is used to indicate that the connection was already
connected. It can be used by I/O handlers to know that a connection
has just completed. It is used by stream_sock_update_conn(), allowing
the sock_opt handlers not to manipulate the SI timeout nor the
BF_WRITE_NULL flag anymore.
This commit is contained in:
Willy Tarreau 2012-07-23 19:45:44 +02:00 committed by Willy Tarreau
parent 3c55ec2020
commit 8f8c92fe93
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/connection.h
View File

@ -39,6 +39,7 @@ enum {
/* flags below are used for connection handshakes */ /* flags below are used for connection handshakes */
CO_FL_SI_SEND_PROXY = 0x00000004, /* send a valid PROXY protocol header */ CO_FL_SI_SEND_PROXY = 0x00000004, /* send a valid PROXY protocol header */
CO_FL_NOTIFY_SI = 0x00000008, /* notify stream interface about changes */ CO_FL_NOTIFY_SI = 0x00000008, /* notify stream interface about changes */
CO_FL_CONNECTED = 0x00000010, /* the connection is now established */
}; };
/* This structure describes a connection with its methods and data. /* This structure describes a connection with its methods and data.

4
src/connection.c
View File

@ -63,6 +63,10 @@ int conn_fd_handler(int fd)
if (conn->flags & CO_FL_NOTIFY_SI) if (conn->flags & CO_FL_NOTIFY_SI)
stream_sock_update_conn(conn); stream_sock_update_conn(conn);
/* Last check, verify if the connection just established */
if (!(conn->flags & (CO_FL_WAIT_L4_CONN | CO_FL_CONNECTED)))
conn->flags |= CO_FL_CONNECTED;
/* remove the events before leaving */ /* remove the events before leaving */
fdtab[fd].ev &= ~(FD_POLL_IN | FD_POLL_OUT | FD_POLL_HUP | FD_POLL_ERR); fdtab[fd].ev &= ~(FD_POLL_IN | FD_POLL_OUT | FD_POLL_HUP | FD_POLL_ERR);
return ret; return ret;

12
src/proto_tcp.c
View File

@ -527,8 +527,6 @@ 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;
struct stream_interface *si = container_of(conn, struct stream_interface, conn);
struct buffer *b = si->ob;
int retval = 0; int retval = 0;
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
@ -541,10 +539,6 @@ int tcp_connect_probe(struct connection *conn)
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)
goto out_error; goto out_error;
/* we might have been called just after an asynchronous shutw */
if (b->flags & BF_SHUTW)
goto out_wakeup;
/* We have no data to send to check the connection, and /* We have no data to send to check the connection, and
* getsockopt() will not inform us whether the connection * getsockopt() will not inform us whether the connection
* is still pending. So we'll reuse connect() to check the * is still pending. So we'll reuse connect() to check the
@ -564,17 +558,11 @@ int tcp_connect_probe(struct connection *conn)
/* otherwise we're connected */ /* otherwise we're connected */
} }
/* OK we just need to indicate that we got a connection
* and that we wrote nothing.
*/
b->flags |= BF_WRITE_NULL;
/* The FD is ready now, we'll mark the connection as complete and /* The FD is ready now, we'll mark the connection as complete and
* forward the event to the data layer which will update the stream * forward the event to the data layer which will update the stream
* interface flags. * interface flags.
*/ */
conn->flags &= ~CO_FL_WAIT_L4_CONN; conn->flags &= ~CO_FL_WAIT_L4_CONN;
si->exp = TICK_ETERNITY;
out_wakeup: out_wakeup:
out_ignore: out_ignore:

6
src/stream_interface.c
View File

@ -501,6 +501,12 @@ void stream_sock_update_conn(struct connection *conn)
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
si->flags |= SI_FL_ERR; si->flags |= SI_FL_ERR;
/* check for recent connection establishment */
if (!(conn->flags & (CO_FL_WAIT_L4_CONN | CO_FL_CONNECTED))) {
si->exp = TICK_ETERNITY;
si->ob->flags |= BF_WRITE_NULL;
}
/* process consumer side, only once if possible */ /* process consumer side, only once if possible */
if (fdtab[fd].ev & (FD_POLL_OUT | FD_POLL_ERR)) { if (fdtab[fd].ev & (FD_POLL_OUT | FD_POLL_ERR)) {
if (si->ob->flags & BF_OUT_EMPTY) { if (si->ob->flags & BF_OUT_EMPTY) {