MEDIUM: connections: Introduce a new XPRT method, start().
Introduce a new XPRT method, start(). The init() method will now only
initialize whatever is needed for the XPRT to run, but any action the XPRT
has to do before being ready, such as handshakes, will be done in the new
start() method. That way, we will be sure the full stack of xprt will be
initialized before attempting to do anything.
The init() call is also moved to conn_prepare(). There's no longer any reason
to wait for the ctrl to be ready, any action will be deferred until start(),
anyway. This means conn_xprt_init() is no longer needed.
diff --git a/src/session.c b/src/session.c
index daf3995..f78c2df 100644
--- a/src/session.c
+++ b/src/session.c
@@ -148,7 +148,9 @@
cli_conn->proxy_netns = l->rx.settings->netns;
- conn_prepare(cli_conn, l->rx.proto, l->bind_conf->xprt);
+ if (conn_prepare(cli_conn, l->rx.proto, l->bind_conf->xprt) < 0)
+ goto out_free_conn;
+
conn_ctrl_init(cli_conn);
/* wait for a PROXY protocol header */
@@ -159,9 +161,6 @@
if (l->options & LI_O_ACC_CIP)
cli_conn->flags |= CO_FL_ACCEPT_CIP;
- if (conn_xprt_init(cli_conn) < 0)
- goto out_free_conn;
-
/* Add the handshake pseudo-XPRT */
if (cli_conn->flags & (CO_FL_ACCEPT_PROXY | CO_FL_ACCEPT_CIP)) {
if (xprt_add_hs(cli_conn) != 0)
@@ -182,6 +181,9 @@
ret = 0; /* successful termination */
goto out_free_sess;
}
+ /* TCP rules may flag the connection as needing proxy protocol, now that it's done we can start ourxprt */
+ if (conn_xprt_start(cli_conn) < 0)
+ goto out_free_conn;
/* Adjust some socket options */
if (l->rx.addr.ss_family == AF_INET || l->rx.addr.ss_family == AF_INET6) {