MINOR: connection: Call sc_conn_process() instead of .wake() callback function

At we fail to create a mux, in conn_create_mux(), instead of calling the
app_ops .wake() callback function, we can directly call sc_conn_process().
At this stage, we know we are using an connection, so it is safe to do so.

diff --git a/include/haproxy/stconn.h b/include/haproxy/stconn.h
index 4b8ffd675750a24e16f52fc692248e6ba7e20382..9a223a8d573712afa70c00b432c3c166e4f28851 100644 (file)
--- a/include/haproxy/stconn.h
+++ b/include/haproxy/stconn.h
@@ -58,6 +58,7 @@ int sc_reset_endp(struct stconn *sc);
 
 struct appctx *sc_applet_create(struct stconn *sc, struct applet *app);
 int sc_applet_process(struct stconn *sc);
+int sc_conn_process(struct stconn *sc);
 
 void sc_conn_prepare_endp_upgrade(struct stconn *sc);
 void sc_conn_abort_endp_upgrade(struct stconn *sc);

diff --git a/src/connection.c b/src/connection.c
index 445991421c2e44fec0d9966064fb2b4773d23bc9..9986885d4f4f7d3cfca6023a38125d241fa83e57 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -141,7 +141,7 @@ int conn_create_mux(struct connection *conn, int *closed_connection)
 fail:
                /* let the upper layer know the connection failed */
                if (sc) {
-                       sc->app_ops->wake(sc);
+                       sc_conn_process(sc);
                }
                else if (conn_reverse_in_preconnect(conn)) {
                        struct listener *l = conn_active_reverse_listener(conn);

diff --git a/src/stconn.c b/src/stconn.c
index c036a46128927c93f8e61fb49ad66ad4abbb199d..0a92b569dd89a3f33d38cb8deedd26f1c54e8fcd 100644 (file)
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -47,7 +47,6 @@ static void sc_app_shut_applet(struct stconn *sc);
 static void sc_app_chk_rcv_applet(struct stconn *sc);
 static void sc_app_chk_snd_applet(struct stconn *sc);
 
-static int sc_conn_process(struct stconn *sc);
 static int sc_conn_recv(struct stconn *sc);
 static int sc_conn_send(struct stconn *sc);