REORG: stconn: rename conn_stream.{c,h} to stconn.{c,h}

There's no more reason for keepin the code and definitions in conn_stream,
let's move all that to stconn. The alphabetical ordering of include files
was adjusted.

diff --git a/Makefile b/Makefile
index 918ddc178ae41c2e68b30d0b7215de06c17f7159..fb57ef8aef339a0eba707e5fa69914b566037c1a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -953,7 +953,7 @@ OBJS += src/mux_h2.o src/mux_fcgi.o src/http_ana.o src/mux_h1.o               \
         src/base64.o src/uri_auth.o src/time.o src/ebsttree.o src/ebistree.o  \
         src/dynbuf.o src/auth.o src/wdt.o src/pipe.o src/http_acl.o           \
         src/hpack-huff.o src/hpack-enc.o src/dict.o src/init.o src/freq_ctr.o \
-        src/ebtree.o src/hash.o src/dgram.o src/version.o src/conn_stream.o   \
+        src/ebtree.o src/hash.o src/dgram.o src/version.o src/stconn.o        \
         src/ncbuf.o
 
 ifneq ($(TRACE),)

diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index 6f54d5afa5e158b3ff55a5ec78a31b48e1faca17..7fffd3b87552ad41bbdeb9e3f3e4ffa780bf1c2b 100644 (file)
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -19,7 +19,6 @@
 #include <haproxy/backend.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
@@ -34,6 +33,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>

diff --git a/dev/flags/flags.c b/dev/flags/flags.c
index f5c1478691c69d4eb2fd954f65e856363f2e6516..5ba10a510bb41645f18e477f87a078733242536e 100644 (file)
--- a/dev/flags/flags.c
+++ b/dev/flags/flags.c
@@ -3,7 +3,7 @@
 
 #include <haproxy/channel-t.h>
 #include <haproxy/connection-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task-t.h>

diff --git a/include/haproxy/applet.h b/include/haproxy/applet.h
index 0b10e5e2c3aa72a0769d16e03d11678390330d8d..776a4015a33191465bf5ce20a5a91bbf4b3f3d83 100644 (file)
--- a/include/haproxy/applet.h
+++ b/include/haproxy/applet.h
@@ -27,11 +27,11 @@
 #include <haproxy/api.h>
 #include <haproxy/applet-t.h>
 #include <haproxy/channel.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 
 extern unsigned int nb_applets;

diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index e53a588ebf6eecba0cf7d3494813a5df7a41515e..1f12afb486e1ca8b1983c502b1d86715b94bf343 100644 (file)
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -396,8 +396,8 @@ struct mux_ops {
        void (*shutr)(struct stconn *cs, enum co_shr_mode);     /* shutr function */
        void (*shutw)(struct stconn *cs, enum co_shw_mode);     /* shutw function */
 
-       int (*attach)(struct connection *conn, struct sedesc *, struct session *sess); /* attach a conn_stream to an outgoing connection */
-       struct stconn *(*get_first_cs)(const struct connection *); /* retrieves any valid conn_stream from this connection */
+       int (*attach)(struct connection *conn, struct sedesc *, struct session *sess); /* attach a stconn to an outgoing connection */
+       struct stconn *(*get_first_cs)(const struct connection *); /* retrieves any valid stconn from this connection */
        void (*detach)(struct sedesc *); /* Detach an stconn from the stdesc from an outgoing connection, when the request is done */
        int (*show_fd)(struct buffer *, struct connection *); /* append some data about connection into chunk for "show fd"; returns non-zero if suspicious */
        int (*subscribe)(struct stconn *cs, int event_type,  struct wait_event *es); /* Subscribe <es> to events, such as "being able to send" */

diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index 34d3f70d7d1ee19285a1aa3511cd5f2c4d0ac0e0..8d99ca26f2a2a3539eb9e012a249840ea202cb1f 100644 (file)
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -27,7 +27,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 #include <haproxy/fd.h>
 #include <haproxy/list.h>
 #include <haproxy/listener-t.h>

diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index 60cc4ad54c09672cc6efce9e9b2339eb5a67347c..99f99702cb4511dc2659fd0c6b66df695e3cf8c7 100644 (file)
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -13,7 +13,7 @@
 #include <haproxy/list-t.h>
 #include <haproxy/ncbuf-t.h>
 #include <haproxy/quic_stream-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 
 /* Stream types */
 enum qcs_type {
@@ -112,7 +112,7 @@ struct qcs {
                uint64_t offset; /* absolute current base offset of ncbuf */
                uint64_t offset_max; /* maximum absolute offset received */
                struct ncbuf ncbuf; /* receive buffer - can handle out-of-order offset frames */
-               struct buffer app_buf; /* receive buffer used by conn_stream layer */
+               struct buffer app_buf; /* receive buffer used by stconn layer */
                uint64_t msd; /* current max-stream-data limit to enforce */
                uint64_t msd_init; /* initial max-stream-data */
        } rx;

diff --git a/include/haproxy/sc_strm.h b/include/haproxy/sc_strm.h
index 363371519976c9cb949594ab205667ec1ca5af8d..946b3bc711651f5b4b221dc6634ef72ed233782d 100644 (file)
--- a/include/haproxy/sc_strm.h
+++ b/include/haproxy/sc_strm.h
@@ -28,9 +28,9 @@
 #include <haproxy/stream-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/channel.h>
 #include <haproxy/session.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 
 void sc_update_rx(struct stconn *cs);

diff --git a/include/haproxy/conn_stream-t.h b/include/haproxy/stconn-t.h
similarity index 97%
rename from include/haproxy/conn_stream-t.h
rename to include/haproxy/stconn-t.h
index 9ee0b9965eaade81cbe67df5d9647f9527cf034a..6623cc3ea229f28bf28c16cb4f90833bbe93249b 100644 (file)
--- a/include/haproxy/conn_stream-t.h
+++ b/include/haproxy/stconn-t.h
@@ -1,10 +1,9 @@
 /*
- * include/haproxy/conn_stream-t.h
+ * include/haproxy/stconn-t.h
  * This file describes the stream connector struct and associated constants.
  *
  * Copyright 2021 Christopher Faulet <cfaulet@haproxy.com>
  *
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation, version 2.1
@@ -20,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_CONN_STREAM_T_H
-#define _HAPROXY_CONN_STREAM_T_H
+#ifndef _HAPROXY_STCONN_T_H
+#define _HAPROXY_STCONN_T_H
 
 #include <haproxy/obj_type-t.h>
 #include <haproxy/connection-t.h>
@@ -140,7 +139,7 @@ enum sc_state_bit {
 struct stconn;
 
 /* A Stream Endpoint Descriptor (sedesc) is the link between the stream
- * connector (ex. conn_stream) and the Stream Endpoint (mux or appctx).
+ * connector (ex. stconn) and the Stream Endpoint (mux or appctx).
  * It always exists for either of them, and binds them together. It also
  * contains some shared information relative to the endpoint. It is created by
  * the first one which needs it and is shared by the other one, i.e. on the
@@ -195,4 +194,4 @@ struct stconn {
 };
 
 
-#endif /* _HAPROXY_CONN_STREAM_T_H */
+#endif /* _HAPROXY_STCONN_T_H */

diff --git a/include/haproxy/conn_stream.h b/include/haproxy/stconn.h
similarity index 97%
rename from include/haproxy/conn_stream.h
rename to include/haproxy/stconn.h
index 0e472856652555008789e6ba38291205c44e99ac..a9b04ce3a96af25cd1faa5bf2f13eb6f7a6173f7 100644 (file)
--- a/include/haproxy/conn_stream.h
+++ b/include/haproxy/stconn.h
@@ -1,5 +1,5 @@
 /*
- * include/haproxy/conn_stream.h
+ * include/haproxy/stconn.h
  * This file contains stream connector function prototypes
  *
  * Copyright 2021 Christopher Faulet <cfaulet@haproxy.com>
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_CONN_STREAM_H
-#define _HAPROXY_CONN_STREAM_H
+#ifndef _HAPROXY_STCONN_H
+#define _HAPROXY_STCONN_H
 
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream-t.h>
 #include <haproxy/obj_type.h>
+#include <haproxy/stconn-t.h>
 
 struct buffer;
 struct session;
@@ -53,7 +53,7 @@ struct appctx *sc_applet_create(struct stconn *cs, struct applet *app);
 
 /* The se_fl_*() set of functions manipulate the stream endpoint flags from
  * the stream endpoint itself. The sc_ep_*() set of functions manipulate the
- * stream endpoint flags from the the stream connector (ex. conn_stream).
+ * stream endpoint flags from the the stream connector (ex. stconn).
  * _zero() clears all flags, _clr() clears a set of flags (&=~), _set() sets
  * a set of flags (|=), _test() tests the presence of a set of flags, _get()
  * retrieves the exact flags, _setall() replaces the flags with the new value.
@@ -398,4 +398,4 @@ static inline void se_need_more_data(struct sedesc *se)
        se_fl_set(se, SE_FL_WILL_CONSUME | SE_FL_WAIT_DATA);
 }
 
-#endif /* _HAPROXY_CONN_STREAM_H */
+#endif /* _HAPROXY_STCONN_H */

diff --git a/include/haproxy/stream-t.h b/include/haproxy/stream-t.h
index e28e7a8a203d4db8d45c7eb446c8166afc802060..5e2261fb278ffd69288eb1c15b10094d73ea2447 100644 (file)
--- a/include/haproxy/stream-t.h
+++ b/include/haproxy/stream-t.h
@@ -26,7 +26,7 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/obj_type-t.h>

diff --git a/include/haproxy/stream.h b/include/haproxy/stream.h
index 49f715be077013f3063bf4a87ab412edad9f9f08..d5de4675e077d8b9deb9f3d734cd18e5a363f90a 100644 (file)
--- a/include/haproxy/stream.h
+++ b/include/haproxy/stream.h
@@ -24,13 +24,13 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool-t.h>
 #include <haproxy/queue.h>
 #include <haproxy/session.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task-t.h>

diff --git a/src/activity.c b/src/activity.c
index ff58fb42e2b99963014e5e63bd1e5e7b5329dcc1..97640f341bdf0cda9ce63c50c3afb0dd039790db 100644 (file)
--- a/src/activity.c
+++ b/src/activity.c
@@ -17,9 +17,9 @@
 #include <haproxy/clock.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/xxhash.h>
 

diff --git a/src/applet.c b/src/applet.c
index ee7abdfbfae676442f467cd4e47a43e783bc18c7..60508665f8dc9a5899bfede4656a3b37bd028f47 100644 (file)
--- a/src/applet.c
+++ b/src/applet.c
@@ -16,9 +16,9 @@
 #include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/list.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 

diff --git a/src/backend.c b/src/backend.c
index ea5f332688aebc027e74f8df77d43f9f30447e76..9b73ec7cba78014e83f36086d0dff64df838ec59 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -27,7 +27,6 @@
 #include <haproxy/backend.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hash.h>
@@ -53,6 +52,7 @@
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>

diff --git a/src/cache.c b/src/cache.c
index 754bf63d379379be94ccc850b2b5bf0309be14c9..c0ea11dadffae3308150de2e6eb19b79233a2950 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -19,7 +19,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/hash.h>
@@ -33,6 +32,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/shctx.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 

diff --git a/src/cli.c b/src/cli.c
index 8bbe853a7d1e9dfeb53cc327e393eaaa5905e6fa..8f21b2e1787af8a75fc7011c08821203a7fcb84e 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -34,7 +34,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/compression.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/errors.h>
@@ -58,6 +57,7 @@
 #include <haproxy/session.h>
 #include <haproxy/sock.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>

diff --git a/src/connection.c b/src/connection.c
index cd32dafeabb02435f99f14881fe4f8c99e583578..a9bbc74ca7d112bbc23acb3deeaf07a7651adff2 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -17,7 +17,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/hash.h>
@@ -30,6 +29,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/xxhash.h>
 

diff --git a/src/debug.c b/src/debug.c
index 73b4a54d362fd60ddd753bbb478fb290f7e76f1a..ca102318f0cb2685185a9e19e8987f77d019fccd 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -30,7 +30,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/clock.h>
 #include <haproxy/debug.h>
 #include <haproxy/fd.h>
@@ -40,6 +39,7 @@
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
 #include <haproxy/time.h>

diff --git a/src/dns.c b/src/dns.c
index ee9b685a8e732ac3c73f05ba1eaeb44e30d9965c..7c5c2222200d89821abaa47c1762556c04b4b7a3 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -25,7 +25,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dgram.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
@@ -33,6 +32,7 @@
 #include <haproxy/log.h>
 #include <haproxy/ring.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index b4c6d270b7c7d854d406d3363dffde25107c85cb..dabe6938d54e3e76431c2e904fc3e3dbca0dbf21 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -19,7 +19,6 @@
 #include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
@@ -34,6 +33,7 @@
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
 #include <haproxy/spoe.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>

diff --git a/src/h3.c b/src/h3.c
index 35c3784a6d372ef8de96b054a3c6b16b30677350..cc609f0d2b3f8334af14a505a6eb28fc1ac19600 100644 (file)
--- a/src/h3.c
+++ b/src/h3.c
@@ -18,7 +18,6 @@
 
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/h3.h>
 #include <haproxy/http.h>
@@ -31,6 +30,7 @@
 #include <haproxy/qpack-dec.h>
 #include <haproxy/qpack-enc.h>
 #include <haproxy/quic_enc.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/xprt_quic.h>
 

diff --git a/src/hlua.c b/src/hlua.c
index f90427007fc675bd56df05d2f4eba3ec1ee83ce3..9304983d0cb8d8c198a3c24b588e3a0026d55dba 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -34,7 +34,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/clock.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/filters.h>
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
@@ -58,6 +57,7 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>

diff --git a/src/http_act.c b/src/http_act.c
index 40438c678b80de5fab5fe5f17061a607188bce1b..de462d298fa5cb0ba782a374d68c20d7e5089513 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -23,7 +23,6 @@
 #include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
@@ -35,6 +34,7 @@
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/uri_normalizer.h>

diff --git a/src/http_ana.c b/src/http_ana.c
index fb5cf030c7c9fdf00a8e8d5d114c5930c7c59c94..6950d8217de32c4d52bb5e047f9733903095e65d 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -21,7 +21,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/http.h>
@@ -35,6 +34,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server-t.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 #include <haproxy/uri_auth-t.h>

diff --git a/src/http_client.c b/src/http_client.c
index 9b344d5fdf913e65dba966bda5730cc76a222b1c..4626d6fad10224d6576212760905d9ab06268b10 100644 (file)
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -18,7 +18,6 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/cfgparse.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/global.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/h1_htx.h>
@@ -35,6 +34,7 @@
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock-t.h>
 #include <haproxy/sock_inet.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 #include <string.h>

diff --git a/src/log.c b/src/log.c
index 0024d949d1e416784e90b0a62c92db45bfe3ff02..287d8a0ce75974532f657428c8acb3349a899930 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -27,7 +27,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/clock.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
@@ -40,6 +39,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/sink.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>

diff --git a/src/map.c b/src/map.c
index 8904c5de5e05646a5d7e23f4e7dada10c79c4b8e..76becb2823cc8aec26fd471f2b145bb597902e62 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -17,13 +17,13 @@
 #include <haproxy/applet.h>
 #include <haproxy/arg.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/map.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index d3db7fe2698aa15167fa78a3e7c9543d5bcaa997..f38a475fae63c82d19e978ad8f2f47b532f16211 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -17,7 +17,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fcgi-app.h>
@@ -33,6 +32,7 @@
 #include <haproxy/regex.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/session-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 #include <haproxy/version.h>

diff --git a/src/mux_h1.c b/src/mux_h1.c
index a30500e0f8393c7b5dbcf3937c9cb62546cae1a6..1985006991cd88fcaf03ebe295f22db3619d8714 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -15,7 +15,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
@@ -28,6 +27,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 

diff --git a/src/mux_h2.c b/src/mux_h2.c
index cfffd6978795fde544faf94df156f2642750a2d7..c405ea6c7338c62f886bafd84a9ede7062e14b5c 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -15,7 +15,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/h2.h>
 #include <haproxy/hpack-dec.h>
@@ -28,6 +27,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 

diff --git a/src/mux_pt.c b/src/mux_pt.c
index acebdee522077f275367f7f6e5a98cce78645ce7..7e119a04876077386b02a52e814a36041a86688e 100644 (file)
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -13,8 +13,8 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/pipe-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/trace.h>

diff --git a/src/mux_quic.c b/src/mux_quic.c
index a993a5aa8367a723c8974034636a2f4963aa01ea..d4256cd98475b74f68871c417f5a5ccb5e1719e9 100644 (file)
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -4,7 +4,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/htx.h>
 #include <haproxy/list.h>
@@ -12,6 +11,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/quic_stream.h>
 #include <haproxy/ssl_sock-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/trace.h>
 #include <haproxy/xprt_quic.h>
 

diff --git a/src/mworker.c b/src/mworker.c
index d246f2b1816575d20a5b79d34a3ea63c743dd4f6..73963cd7fa835ec89f3052227c0bd5769a9adc03 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -25,7 +25,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/global.h>
@@ -36,6 +35,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>

diff --git a/src/payload.c b/src/payload.c
index 08d5826d46a996f9a23f981bfd47685295ba35a8..354ef5c2f871a73e26c025a3d70ebd0dc115593a 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -18,12 +18,12 @@
 #include <haproxy/arg.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/pattern.h>
 #include <haproxy/payload.h>
 #include <haproxy/sample.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/peers.c b/src/peers.c
index 88d609fed5eccdba856624197359303b6a74af64..b0ed81c8cd176c2dd27167fccc9eece017fc32b5 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -27,7 +27,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -40,6 +39,7 @@
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>

diff --git a/src/pool.c b/src/pool.c
index c82dbcbc214103878e342039eb561a8bfff77179..973f8a0f2d4207e37987cf4aaa1b7925e0446e34 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -19,13 +19,13 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
 

diff --git a/src/proxy.c b/src/proxy.c
index 123f94ed7d929fa5ea43ae6bb2a6792510f569e0..b5b903715d15f5d83bf9ca9cbe9fe07af27f6756 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -25,7 +25,6 @@
 #include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/filters.h>
@@ -44,6 +43,7 @@
 #include <haproxy/server-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>

diff --git a/src/resolvers.c b/src/resolvers.c
index 76d94bcdb9f7d89334256eb9478cea9e6bbbb8a2..758dbafa87131d224a791dfe2ce1ca10478ea163 100644 (file)
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -27,7 +27,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -42,6 +41,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/ticks.h>

diff --git a/src/ring.c b/src/ring.c
index d39d8b6ecbe330efbd8831066b6d6f7083dc5ebe..ef8887a4f8529f24ceb1d28f19645f06a816c8c6 100644 (file)
--- a/src/ring.c
+++ b/src/ring.c
@@ -23,9 +23,9 @@
 #include <haproxy/applet.h>
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/ring.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/thread.h>
 
 /* context used to dump the contents of a ring via "show events" or "show errors" */

diff --git a/src/server.c b/src/server.c
index a24a9de26fa7730705bea18ece856095f6cf6503..df84579ba4c4fce9c405b2ab72194340dd045574 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -25,7 +25,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict-t.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -41,6 +40,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>

diff --git a/src/sink.c b/src/sink.c
index 1e4db7e46ba3badf44073b662d480bb947eec16e..d746c38d6efc30765f6549566ab5a76a80842db8 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -23,7 +23,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
@@ -32,6 +31,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
+#include <haproxy/stconn.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
 

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index e85ddbe36ad41d9800c27a3300a2225946f36f8c..d658065cd7a9a796b343302cffe87b44e6be0ea9 100644 (file)
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -30,12 +30,12 @@
 #include <haproxy/base64.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 /* Uncommitted CKCH transaction */

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 6ef9ec22951c961b59a5ab61d59dc05780fa73e8..e0651696ec635f5756b51cff6f371a0aae254ed9 100644 (file)
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -23,12 +23,12 @@
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 /* CLI context for "show ssl crt-list" or "dump ssl crt-list" */

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 9031dc49865c7f877b7a42d293cd1be33b9e0649..6b5f794d9046889206939529859b1b4784fb20fc 100644 (file)
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -25,12 +25,12 @@
 #include <haproxy/base64.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/sample.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/vars.h>
 

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 2499de63e355a9b54be1ffb015e39a68c8bf047a..060269bcf96502f98bd0c39f50fc05a13dc9b54b 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -51,7 +51,6 @@
 #include <haproxy/chunk.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -73,6 +72,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>

diff --git a/src/stats.c b/src/stats.c
index f9d697aa292320c285a276c5e927ae579ee6cbcb..8230956a93dfd077c14c4e7649fbf5c5b3ce4e0d 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -34,7 +34,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/clock.h>
 #include <haproxy/compression.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/debug.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -58,6 +57,7 @@
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>

diff --git a/src/conn_stream.c b/src/stconn.c
similarity index 99%
rename from src/conn_stream.c
rename to src/stconn.c
index 606b7ff7d279164ffeb908bb61a96d11fe009687..0ca04afd6e246f5515f2fcfab5544dea9b3f9501 100644 (file)
--- a/src/conn_stream.c
+++ b/src/stconn.c
@@ -13,12 +13,12 @@
 #include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/check.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/pipe.h>
 #include <haproxy/pool.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 
 DECLARE_POOL(pool_head_connstream, "stconn", sizeof(struct stconn));
 DECLARE_POOL(pool_head_sedesc, "sedesc", sizeof(struct sedesc));

diff --git a/src/stick_table.c b/src/stick_table.c
index f9e84b6de710472bc6822870cf80e9f78e942abe..e907ce10eeff9fcdad8e803b6f13dd7529f780ca 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -23,7 +23,6 @@
 #include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -38,6 +37,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>

diff --git a/src/stream.c b/src/stream.c
index 97db6030d39b61b3dfc6c32ef79221b3686f357f..526d67862871be3b47bde2ac93ca629404b80fda 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -28,7 +28,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/fd.h>
@@ -52,6 +51,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index baa4ba71fdc9bc2f7d1d69f975f65d9b47b57c53..131895340eabbd7dfd6c463a3112a5278745cac6 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -17,13 +17,13 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/tcp_rules.h>

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index d0012a280eacef5a5f76cd79b5913985e8078947..62e28e2f0b25085bac5d0d88ba423c9892e80793 100644 (file)
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -38,7 +38,6 @@
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/h1.h>
@@ -55,6 +54,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
 #include <haproxy/ticks.h>

diff --git a/src/tools.c b/src/tools.c
index f9c1bd43f45a0a710d229c08c8c1b1e82b987315..74903efdaeead27c8c45ef7fd535eb6091794d28 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -53,7 +53,6 @@ extern void *__elf_aux_vector;
 #include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/chunk.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dgram.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
@@ -66,6 +65,7 @@ extern void *__elf_aux_vector;
 #include <haproxy/sock.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>