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/quic_sock.c b/src/quic_sock.c
index 5d030b7..571c5db 100644
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -35,7 +35,8 @@
struct session *sess;
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;
/* This flag is ordinarily set by conn_ctrl_init() which cannot
* be called for now.
@@ -50,14 +51,15 @@
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)
goto out_free_conn;
}
+
+ if (conn_xpt_start(cli_conn < 0))
+ goto out_free_conn;
+
sess = session_new(p, l, &cli_conn->obj_type);
if (!sess)
goto out_free_conn;