REORG: rename cs_utils.h to sc_strm.h

This file contains all the stream-connector functions that are specific
to application layers of type stream. So let's name it accordingly so
that it's easier to figure what's located there.

The alphabetical ordering of include files was preserved.

diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index 4dffbf33f537fafbc6d126eb31c8db6e91576d7a..6f54d5afa5e158b3ff55a5ec78a31b48e1faca17 100644 (file)
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -20,7 +20,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
@@ -32,6 +31,7 @@
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream.h>

diff --git a/include/haproxy/applet.h b/include/haproxy/applet.h
index d695d04084833e6b520baeb3c6e153f78994dd54..0b10e5e2c3aa72a0769d16e03d11678390330d8d 100644 (file)
--- a/include/haproxy/applet.h
+++ b/include/haproxy/applet.h
@@ -28,9 +28,9 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/channel.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/task.h>
 

diff --git a/include/haproxy/cs_utils.h b/include/haproxy/sc_strm.h
similarity index 98%
rename from include/haproxy/cs_utils.h
rename to include/haproxy/sc_strm.h
index 2f7750e1837f056725ce9a836006a502ee920318..363371519976c9cb949594ab205667ec1ca5af8d 100644 (file)
--- a/include/haproxy/cs_utils.h
+++ b/include/haproxy/sc_strm.h
@@ -1,6 +1,6 @@
 /*
- * include/haproxy/cs_utils.h
- * This file contains stream connector util functions prototypes
+ * include/haproxy/sc_strm.h
+ * This file contains stream-specific stream-connector functions prototypes
  *
  * Copyright 2022 Christopher Faulet <cfaulet@haproxy.com>
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_CS_UTILS_H
-#define _HAPROXY_CS_UTILS_H
+#ifndef _HAPROXY_SC_STRM_H
+#define _HAPROXY_SC_STRM_H
 
 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
@@ -381,4 +381,4 @@ static inline int sc_is_send_allowed(const struct stconn *sc)
        return (sc_ep_get(sc) & (SE_FL_WAIT_DATA|SE_FL_WILL_CONSUME)) == SE_FL_WILL_CONSUME;
 }
 
-#endif /* _HAPROXY_CS_UTILS_H */
+#endif /* _HAPROXY_SC_STRM_H */

diff --git a/src/activity.c b/src/activity.c
index 5e73ff4a1d4a8f7fb9e364451b7a8ed02bb5cf08..ff58fb42e2b99963014e5e63bd1e5e7b5329dcc1 100644 (file)
--- a/src/activity.c
+++ b/src/activity.c
@@ -18,8 +18,8 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/freq_ctr.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/tools.h>
 #include <haproxy/xxhash.h>
 

diff --git a/src/applet.c b/src/applet.c
index 78e04ae1f90eefe3bb61ef09bbebbff9bc380f12..ee7abdfbfae676442f467cd4e47a43e783bc18c7 100644 (file)
--- a/src/applet.c
+++ b/src/applet.c
@@ -17,8 +17,8 @@
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/list.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 

diff --git a/src/backend.c b/src/backend.c
index 7b88097db0f5f3b4a0ce91ac46bcc9378f9026ec..ea5f332688aebc027e74f8df77d43f9f30447e76 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -28,7 +28,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hash.h>
@@ -50,6 +49,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>

diff --git a/src/cache.c b/src/cache.c
index 366add80c62d31750a042c3c4635e209cee198ef..754bf63d379379be94ccc850b2b5bf0309be14c9 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -20,7 +20,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/hash.h>
@@ -32,6 +31,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/shctx.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>

diff --git a/src/cli.c b/src/cli.c
index aeba3f3165e65e8d06235b4cff3203739211903b..8bbe853a7d1e9dfeb53cc327e393eaaa5905e6fa 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -35,7 +35,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/compression.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/errors.h>
@@ -54,6 +53,7 @@
 #include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample-t.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/sock.h>

diff --git a/src/conn_stream.c b/src/conn_stream.c
index 4e1e5c6b56a17bb0e6146f3db570a1dfce03c0bf..606b7ff7d279164ffeb908bb61a96d11fe009687 100644 (file)
--- a/src/conn_stream.c
+++ b/src/conn_stream.c
@@ -14,11 +14,11 @@
 #include <haproxy/applet.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/check.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/pipe.h>
 #include <haproxy/pool.h>
+#include <haproxy/sc_strm.h>
 
 DECLARE_POOL(pool_head_connstream, "stconn", sizeof(struct stconn));
 DECLARE_POOL(pool_head_sedesc, "sedesc", sizeof(struct sedesc));

diff --git a/src/connection.c b/src/connection.c
index 9ad413c719c8023ef5e0badbd8f0d3c3b6383bbc..cd32dafeabb02435f99f14881fe4f8c99e583578 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -18,7 +18,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/hash.h>
@@ -28,6 +27,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/tools.h>

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

diff --git a/src/dns.c b/src/dns.c
index bab396b5c6638dcd12584fe60ab65dada5560adc..ee9b685a8e732ac3c73f05ba1eaeb44e30d9965c 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -26,13 +26,13 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dgram.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/log.h>
 #include <haproxy/ring.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index e55070cce0606a27b70043a75bb6db00619244f2..b4c6d270b7c7d854d406d3363dffde25107c85cb 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -20,7 +20,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
@@ -30,6 +29,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>

diff --git a/src/frontend.c b/src/frontend.c
index b50c86ff39a76b2b9b9b15fb9ab206f25053e4d3..7b71357984f4ce62ba272332bc71b2f6f9a55db7 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -26,7 +26,6 @@
 #include <haproxy/arg.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
@@ -35,6 +34,7 @@
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>

diff --git a/src/hlua.c b/src/hlua.c
index 166423aaefbc316c910db3a3ce3494d3e6daea9a..f90427007fc675bd56df05d2f4eba3ec1ee83ce3 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -35,7 +35,6 @@
 #include <haproxy/clock.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/filters.h>
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
@@ -53,6 +52,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_ckch.h>

diff --git a/src/http_act.c b/src/http_act.c
index 51ba6cba7be24ddf35cc107e95c59c9db2439523..40438c678b80de5fab5fe5f17061a607188bce1b 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -24,7 +24,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
@@ -35,6 +34,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.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 cb7bbbfc06683e49756555b901b5ebc927f6cbe8..fb5cf030c7c9fdf00a8e8d5d114c5930c7c59c94 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -22,7 +22,6 @@
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/http.h>
@@ -33,6 +32,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server-t.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream.h>

diff --git a/src/http_client.c b/src/http_client.c
index fe4e1d6de63fe3fdc2eca0bdad8ec7afd633742a..9b344d5fdf913e65dba966bda5730cc76a222b1c 100644 (file)
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -19,7 +19,6 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/h1_htx.h>
@@ -32,6 +31,7 @@
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/resolvers.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock-t.h>
 #include <haproxy/sock_inet.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 49ea4262ab698ce8b48fac10e2ef4abc3d18f58e..c3e8599cf0122b1be2463935a4197db23ee8c643 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -23,7 +23,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
@@ -35,6 +34,7 @@
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>

diff --git a/src/log.c b/src/log.c
index 25eff5e7878f7ee65ac51627fd1242e8247230d1..0024d949d1e416784e90b0a62c92db45bfe3ff02 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -28,7 +28,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/clock.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
@@ -38,6 +37,7 @@
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/sink.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream.h>

diff --git a/src/map.c b/src/map.c
index 3c04eb709a16c96d9db53d7f41702bf5775d908a..8904c5de5e05646a5d7e23f4e7dada10c79c4b8e 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -18,11 +18,11 @@
 #include <haproxy/arg.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.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/tools.h>
 

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 5739675a419946c2048cb2b9461f09f991868554..d3db7fe2698aa15167fa78a3e7c9543d5bcaa997 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -18,7 +18,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fcgi-app.h>
@@ -32,6 +31,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>

diff --git a/src/mworker.c b/src/mworker.c
index 95a22655cdee5d6b3137c6767fbc730824b4887b..d246f2b1816575d20a5b79d34a3ea63c743dd4f6 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -26,7 +26,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/global.h>
@@ -35,6 +34,7 @@
 #include <haproxy/mworker.h>
 #include <haproxy/peers.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>

diff --git a/src/peers.c b/src/peers.c
index e72ffca67222c221aaa4381d1191e86215853342..88d609fed5eccdba856624197359303b6a74af64 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -28,7 +28,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -37,6 +36,7 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>

diff --git a/src/pool.c b/src/pool.c
index a47168fb609fc4b7a85d3fc96158eaea808f434f..c82dbcbc214103878e342039eb561a8bfff77179 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -20,11 +20,11 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.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/thread.h>
 #include <haproxy/tools.h>

diff --git a/src/proxy.c b/src/proxy.c
index df460858d7fba54118256b9e0b35fe05cac3783d..123f94ed7d929fa5ea43ae6bb2a6792510f569e0 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,7 +26,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/filters.h>
@@ -41,6 +40,7 @@
 #include <haproxy/protocol.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>

diff --git a/src/resolvers.c b/src/resolvers.c
index 2b3e128f7b854b2e6df5624cef14a954437b9308..76d94bcdb9f7d89334256eb9478cea9e6bbbb8a2 100644 (file)
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -28,7 +28,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -40,6 +39,7 @@
 #include <haproxy/resolvers.h>
 #include <haproxy/ring.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
 #include <haproxy/task.h>

diff --git a/src/ring.c b/src/ring.c
index 873d0d6bf2d865a987f958d1ff6a3d5ceabe1980..d39d8b6ecbe330efbd8831066b6d6f7083dc5ebe 100644 (file)
--- a/src/ring.c
+++ b/src/ring.c
@@ -24,8 +24,8 @@
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/ring.h>
+#include <haproxy/sc_strm.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 6057b4fdec59435430a23e0a2c3a57879961e29f..a24a9de26fa7730705bea18ece856095f6cf6503 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -26,7 +26,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict-t.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -39,6 +38,7 @@
 #include <haproxy/queue.h>
 #include <haproxy/resolvers.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream.h>

diff --git a/src/sink.c b/src/sink.c
index ebd436f95964fa06f1fc327725d1d68b00c3c021..1e4db7e46ba3badf44073b662d480bb947eec16e 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -24,12 +24,12 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/ring.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
 #include <haproxy/time.h>

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 1accf60f199ad82ed6a46560858b4340d27d3370..e85ddbe36ad41d9800c27a3300a2225946f36f8c 100644 (file)
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -31,8 +31,8 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.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>

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index e4297906aab03abf67cdd8be1101a5c1164f7993..6ef9ec22951c961b59a5ab61d59dc05780fa73e8 100644 (file)
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -24,8 +24,8 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.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>

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index ee73566ecf4e11164b4b77e70746475fb619d4f7..2499de63e355a9b54be1ffb015e39a68c8bf047a 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -52,7 +52,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -65,13 +64,14 @@
 #include <haproxy/pattern-t.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/shctx.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
-#include <haproxy/sample.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task.h>

diff --git a/src/stats.c b/src/stats.c
index c1fedaaf2d747c006408ddf51cf55aa5bb7bbd4e..f9d697aa292320c285a276c5e927ae579ee6cbcb 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -35,7 +35,6 @@
 #include <haproxy/clock.h>
 #include <haproxy/compression.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/debug.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -55,6 +54,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/resolvers.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/stats.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index b9ad124b9662dbd98aa32da9eca9e1c49c71b59a..f9e84b6de710472bc6822870cf80e9f78e942abe 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -24,7 +24,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -37,6 +36,7 @@
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>

diff --git a/src/stream.c b/src/stream.c
index e53a3828c8eddb3c6a97c51bd945071cd20c430f..97db6030d39b61b3dfc6c32ef79221b3686f357f 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -29,7 +29,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/fd.h>
@@ -47,6 +46,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/resolvers.h>
 #include <haproxy/sample.h>

diff --git a/src/tcp_act.c b/src/tcp_act.c
index fc1b091223632ef658de9b2f450a8c77db318f20..f31c9c3b921ab2107736bc25678d673890ca5252 100644 (file)
--- a/src/tcp_act.c
+++ b/src/tcp_act.c
@@ -29,12 +29,12 @@
 #include <haproxy/arg.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 8b9aa7656c5c5bf0da7641889a9a152fff88e2dc..baa4ba71fdc9bc2f7d1d69f975f65d9b47b57c53 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -18,12 +18,12 @@
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.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/stick_table.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/tcp_rules.h>

diff --git a/src/tcp_sample.c b/src/tcp_sample.c
index a8895b1a450cf40a8d78fe243f118e674789c90d..99bb51402041a7608077555b52579f08810b7de7 100644 (file)
--- a/src/tcp_sample.c
+++ b/src/tcp_sample.c
@@ -32,13 +32,13 @@
 #include <haproxy/api.h>
 #include <haproxy/arg.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/namespace.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/tools.h>
 

diff --git a/src/tools.c b/src/tools.c
index 05f4f308ca92309020d27a91af9ba12bfc7699f3..f9c1bd43f45a0a710d229c08c8c1b1e82b987315 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -54,7 +54,6 @@ extern void *__elf_aux_vector;
 #include <haproxy/applet.h>
 #include <haproxy/chunk.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dgram.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
@@ -63,6 +62,7 @@ extern void *__elf_aux_vector;
 #include <haproxy/net_helper.h>
 #include <haproxy/protocol.h>
 #include <haproxy/resolvers.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/sock.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>