kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: connection: No longer include stconn type header in connection-t.h

Browse Source 
It is a small change, but it is cleaner to no include stconn-t.h header in
connection-t.h, mainly to avoid circular definitions.

The related issue is #2502.

(cherry picked from commit 4b8098bf4831c0dfca4a058bd3170a5ed7ae8bbf)
Signed-off-by: William Lallemand <wlallemand@haproxy.com>
This commit is contained in:
Christopher Faulet 2024-07-04 10:09:16 +02:00 committed by William Lallemand
parent 8e879a52e2
commit 10827a18ec
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/connection-t.h
View File

@ -37,7 +37,6 @@
#include <haproxy/port_range-t.h>
#include <haproxy/protocol-t.h>
#include <haproxy/show_flags-t.h>
#include <haproxy/stconn-t.h>
#include <haproxy/task-t.h>
#include <haproxy/thread-t.h>
@ -45,6 +44,7 @@
struct connection;
struct stconn;
struct sedesc;
struct se_abort_info;
struct cs_info;
struct buffer;
struct proxy;
@ -413,7 +413,7 @@ struct mux_ops {
size_t (*done_fastfwd)(struct stconn *sc); /* Callback to terminate fast data forwarding */
int (*fastfwd)(struct stconn *sc, unsigned int count, unsigned int flags); /* Callback to init fast data forwarding */
int (*resume_fastfwd)(struct stconn *sc, unsigned int flags); /* Callback to resume fast data forwarding */
void (*shut)(struct stconn *sc, enum se_shut_mode, struct se_abort_info *reason); /* shutdown function */
void (*shut)(struct stconn *sc, unsigned int mode, struct se_abort_info *reason); /* shutdown function */
int (*attach)(struct connection *conn, struct sedesc *, struct session *sess); /* attach a stconn to an outgoing connection */
struct stconn *(*get_first_sc)(const struct connection *); /* retrieves any valid stconn from this connection */

2
src/mux_fcgi.c
View File

@ -3794,7 +3794,7 @@ struct task *fcgi_deferred_shut(struct task *t, void *ctx, unsigned int state)
return NULL;
}
static void fcgi_shut(struct stconn *sc, enum se_shut_mode mode, struct se_abort_info *reason)
static void fcgi_shut(struct stconn *sc, unsigned int mode, struct se_abort_info *reason)
{
struct fcgi_strm *fstrm = __sc_mux_strm(sc);

2
src/mux_h1.c
View File

@ -4374,7 +4374,7 @@ static void h1_detach(struct sedesc *sd)
TRACE_LEAVE(H1_EV_STRM_END);
}
static void h1_shut(struct stconn *sc, enum se_shut_mode mode, struct se_abort_info *reason)
static void h1_shut(struct stconn *sc, unsigned int mode, struct se_abort_info *reason)
{
struct h1s *h1s = __sc_mux_strm(sc);
struct h1c *h1c;

2
src/mux_h2.c
View File

@ -5121,7 +5121,7 @@ struct task *h2_deferred_shut(struct task *t, void *ctx, unsigned int state)
return t;
}
static void h2_shut(struct stconn *sc, enum se_shut_mode mode, struct se_abort_info *reason)
static void h2_shut(struct stconn *sc, unsigned int mode, struct se_abort_info *reason)
{
struct h2s *h2s = __sc_mux_strm(sc);

2
src/mux_pt.c
View File

@ -462,7 +462,7 @@ static int mux_pt_avail_streams(struct connection *conn)
return 1 - mux_pt_used_streams(conn);
}
static void mux_pt_shut(struct stconn *sc, enum se_shut_mode mode, struct se_abort_info *reason)
static void mux_pt_shut(struct stconn *sc, unsigned int mode, struct se_abort_info *reason)
{
struct connection *conn = __sc_conn(sc);
struct mux_pt_ctx *ctx = conn->ctx;

2
src/mux_quic.c
View File

@ -3160,7 +3160,7 @@ static int qmux_wake(struct connection *conn)
return 1;
}
static void qmux_strm_shut(struct stconn *sc, enum se_shut_mode mode, struct se_abort_info *reason)
static void qmux_strm_shut(struct stconn *sc, unsigned int mode, struct se_abort_info *reason)
{
struct qcs *qcs = __sc_mux_strm(sc);
struct qcc *qcc = qcs->qcc;