REORG: include: move stream_interface.h to haproxy/stream_interface{,-t}.h

Almost no changes, removed stdlib and added buf-t and connection-t to
the types to avoid a warning.

diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c
index 485fc0e6ceddf920e3732e28b542aeee21b7834f..0458639894258348086a7f20a69084c1708c5fd8 100644 (file)
--- a/contrib/debug/flags.c
+++ b/contrib/debug/flags.c
@@ -5,7 +5,7 @@
 #include <haproxy/connection-t.h>
 #include <types/http_ana.h>
 #include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/task-t.h>
 
 // 1 bit per flag, no hole permitted here

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 181d689d86a02947f124a34a8dce7b96e4d853f6..41207ab477440936b8a637271a45b8ed88667ece 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -35,7 +35,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 
 /* Prometheus exporter applet states (appctx->st0) */

diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index d77717a938d1f8ed649986dfc81bb7e6c271614c..f59cf0a9326bf1eadb2313fd325e1ef201185780 100644 (file)
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -32,7 +32,7 @@
 #include <types/proxy.h>
 #include <types/server.h>
 #include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
 
 static inline enum obj_type obj_type(const enum obj_type *t)
 {

diff --git a/include/haproxy/stats.h b/include/haproxy/stats.h
index 7fb57754c3a96730cdf21b39adc800e75a3938c4..b79e1abb5218cd7a2d8f4c80504eb05df7699f65 100644 (file)
--- a/include/haproxy/stats.h
+++ b/include/haproxy/stats.h
@@ -25,9 +25,9 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/tools-t.h>
-#include <types/stream_interface.h>
 
 
 /* These two structs contains all field names and descriptions according to

diff --git a/include/types/stream_interface.h b/include/haproxy/stream_interface-t.h
similarity index 97%
rename from include/types/stream_interface.h
rename to include/haproxy/stream_interface-t.h
index a60de10b6ef17239ae6954a74049d04f6b695e33..e95c72d5aa3e593688376380853f21efd3543514 100644 (file)
--- a/include/types/stream_interface.h
+++ b/include/haproxy/stream_interface-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/stream_interface.h
+ * include/haproxy/stream_interface-t.h
  * This file describes the stream_interface struct and associated constants.
  *
  * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_STREAM_INTERFACE_H
-#define _TYPES_STREAM_INTERFACE_H
+#ifndef _HAPROXY_STREAM_INTERFACE_T_H
+#define _HAPROXY_STREAM_INTERFACE_T_H
 
 #include <haproxy/api-t.h>
+#include <haproxy/buf-t.h>
+#include <haproxy/connection-t.h>
 #include <haproxy/obj_type-t.h>
 
 /* A stream interface must have its own errors independently of the buffer's,
@@ -142,7 +144,7 @@ struct si_ops {
        void (*shutw)(struct stream_interface *);   /* shut write function, may not be null */
 };
 
-#endif /* _TYPES_STREAM_INTERFACE_H */
+#endif /* _HAPROXY_STREAM_INTERFACE_T_H */
 
 /*
  * Local variables:

diff --git a/include/proto/stream_interface.h b/include/haproxy/stream_interface.h
similarity index 98%
rename from include/proto/stream_interface.h
rename to include/haproxy/stream_interface.h
index f17e6aec07c80ce9ce4b7063c3e8951dd169f36a..7322dd187aa3bfea78c3c50756d05fea9a8a6bae 100644 (file)
--- a/include/proto/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/stream_interface.h
+ * include/haproxy/stream_interface.h
  * This file contains stream_interface function prototypes
  *
  * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,17 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_STREAM_INTERFACE_H
-#define _PROTO_STREAM_INTERFACE_H
-
-#include <stdlib.h>
+#ifndef _HAPROXY_STREAM_INTERFACE_H
+#define _HAPROXY_STREAM_INTERFACE_H
 
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
-#include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
 #include <proto/channel.h>
+#include <types/stream.h>
 
 
 extern struct si_ops si_embedded_ops;
@@ -567,7 +565,7 @@ static inline const char *si_state_str(int state)
        }
 }
 
-#endif /* _PROTO_STREAM_INTERFACE_H */
+#endif /* _HAPROXY_STREAM_INTERFACE_H */
 
 /*
  * Local variables:

diff --git a/include/proto/channel.h b/include/proto/channel.h
index 96bf2125aaa69185e879e7d28ed80224e7a79a24..3ff81ad9ab9c55be32f07e2f4c51bdbd74d7f9f7 100644 (file)
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -32,12 +32,12 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/global.h>
 #include <haproxy/htx.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/channel.h>
 #include <types/stream.h>
-#include <types/stream_interface.h>
 
 #include <proto/stream.h>
 #include <haproxy/task.h>

diff --git a/include/types/stream.h b/include/types/stream.h
index 0c1475f0c14d77b05113dda749ba034fe6ff7bf6..a67d1926e72ba06e5a420c939c349030595f0d1a 100644 (file)
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -34,6 +34,7 @@
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/session-t.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/vars-t.h>
 
 #include <types/channel.h>
@@ -42,7 +43,6 @@
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
-#include <types/stream_interface.h>
 #include <haproxy/task-t.h>
 #include <haproxy/stick_table-t.h>
 

diff --git a/src/activity.c b/src/activity.c
index 1f2ab487d2654547720d7dd5a119e8e8f4aece0f..29977d2a7a1a79d2e1c7905a930b96719e4f80a6 100644 (file)
--- a/src/activity.c
+++ b/src/activity.c
@@ -13,12 +13,12 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/cli.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/activity-t.h>
 #include <proto/channel.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/stream_interface.h>
 
 
 /* bit field of profiling options. Beware, may be modified at runtime! */

diff --git a/src/applet.c b/src/applet.c
index 760ddc302424d6f14e7d537a94141c2feff75127..36607aa88c27c7eb2574d59883566fe29417c1ca 100644 (file)
--- a/src/applet.c
+++ b/src/applet.c
@@ -16,10 +16,10 @@
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/list.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <proto/channel.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 unsigned int nb_applets = 0;
 

diff --git a/src/backend.c b/src/backend.c
index b730df7753abcc06f93db2e1175da0b200a6fa7c..f06cf64f2b8b91c5a39c53975bd09c3ff1f32165 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -36,6 +36,7 @@
 #include <haproxy/payload.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -55,7 +56,6 @@
 #include <haproxy/sample.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 

diff --git a/src/cache.c b/src/cache.c
index 138ae525d0441600f9b55cb186a50bdb9b6dbe74..8a97f4ef3f18de6fe9334e232729f61cf687cffd 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -16,6 +16,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/shctx.h>
+#include <haproxy/stream_interface.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
@@ -28,7 +29,6 @@
 #include <proto/http_ana.h>
 #include <proto/log.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 #include <common/cfgparse.h>

diff --git a/src/check.c b/src/check.c
index edb4fea4b8a7455166d1779e1123df2f54c24d1d..7381a324ff48e0891752464c916ee7159e0ad831 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -49,6 +49,7 @@
 #include <haproxy/signal.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/vars.h>
 
@@ -64,7 +65,6 @@
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 #include <proto/log.h>
 #include <haproxy/proto_udp.h>
 #include <haproxy/sample.h>

diff --git a/src/cli.c b/src/cli.c
index 2b54dc1aadb07df39dd484aa69409e3479714b14..d72fb5b876bf99a318c206ffde0858f09291504b 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -41,6 +41,7 @@
 #include <haproxy/sample-t.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -62,7 +63,6 @@
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 
 #define PAYLOAD_PATTERN "<<"
 

diff --git a/src/connection.c b/src/connection.c
index 6575230b80ca13135aa1df2826e0e1270e04def6..3c9b21e7c134a919ccafc6c47e5b5e21b7e90807 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -22,9 +22,9 @@
 
 #include <haproxy/fd.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/stream_interface.h>
 #include <haproxy/sample.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 
 
 DECLARE_POOL(pool_head_connection, "connection",  sizeof(struct connection));

diff --git a/src/debug.c b/src/debug.c
index 51c84cb0d8fa5a56065d85438435a176f7e91a2e..4f7e6cea74fe8b6e204911f25345d0e21386f481 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -24,6 +24,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/debug.h>
 #include <haproxy/hlua.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
 #include <import/ist.h>
@@ -33,7 +34,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/stream_interface.h>
 
 /* mask of threads still having to dump, used to respect ordering. Only used
  * when USE_THREAD_DUMP is set.

diff --git a/src/dns.c b/src/dns.c
index e54205b810e151612e33e8dfddd5b6f965d5138a..799c7eb99718b662fe861a2df88087f39fe1bc63 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -29,6 +29,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
@@ -45,7 +46,6 @@
 #include <proto/server.h>
 #include <haproxy/proto_udp.h>
 #include <proto/proxy.h>
-#include <proto/stream_interface.h>
 
 struct list dns_resolvers  = LIST_HEAD_INIT(dns_resolvers);
 struct list dns_srvrq_list = LIST_HEAD_INIT(dns_srvrq_list);

diff --git a/src/filters.c b/src/filters.c
index bf9e6ed69b1029a16f7ba32570565c45a2b4d7ad..de5d9f276911f581a722ceb146e91681b0eb910a 100644 (file)
--- a/src/filters.c
+++ b/src/filters.c
@@ -18,6 +18,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/namespace.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <types/filters.h>
@@ -27,7 +28,6 @@
 #include <proto/filters.h>
 #include <proto/http_ana.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 7d36a8e0ce90cae211d8abc4eb61776c6cc807a6..d483ba53ad187ffe87080745b9e75923dca16338 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -23,6 +23,7 @@
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/session.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
@@ -41,7 +42,6 @@
 #include <proto/proxy.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #if defined(DEBUG_SPOE) || defined(DEBUG_FULL)
 #define SPOE_PRINTF(x...) fprintf(x)

diff --git a/src/frontend.c b/src/frontend.c
index 068e8d69f7c9418a453e81f2d097078c08c9a139..5f3d6cf1186b839392643ecb224d3a08477420ba 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -27,6 +27,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/frontend.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
@@ -41,7 +42,6 @@
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 /* Finish a stream accept() for a proxy (TCP or HTTP). It returns a negative
  * value in case of a critical failure which must cause the listener to be

diff --git a/src/hlua.c b/src/hlua.c
index 1538739b036a0863017cd9558346d9b53de84ea2..804f9fa92c56d823b0256e010c232dfc54958dba 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -44,6 +44,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
@@ -57,7 +58,6 @@
 #include <proto/http_ana.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 /* Lua uses longjmp to perform yield or throwing errors. This
  * macro is used only for identifying the function that can

diff --git a/src/http_act.c b/src/http_act.c
index 37966f399bf5d78e01215e28ac41e2b878ca7fca..4c283283d68ff045b224b60da9d6b2b25c732d3e 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -29,6 +29,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/version.h>
@@ -38,7 +39,6 @@
 #include <haproxy/arg.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
-#include <proto/stream_interface.h>
 
 /* Release memory allocated by most of HTTP actions. Concretly, it releases
  * <arg.http>.

diff --git a/src/http_ana.c b/src/http_ana.c
index 690640fb0faa66460950336d934c65d054a5cc5c..4675a2d0de36ffa48075d94b83c456192e442122 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -22,6 +22,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/vars.h>
 
@@ -34,7 +35,6 @@
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 

diff --git a/src/log.c b/src/log.c
index bafd8782ebe08579526dd3c7467b9b0d19a81c76..4f095cafd67c14c11d44e04f5a406c29a5af68fe 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -30,6 +30,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/http.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
@@ -43,7 +44,6 @@
 #include <haproxy/sample.h>
 #include <haproxy/sink.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 struct log_fmt {
        char *name;

diff --git a/src/map.c b/src/map.c
index 8b7cc5113ba84bd1727692db4924518058527b3a..7beefde7461dd52e70668e563c4410224fc8f996 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -19,11 +19,11 @@
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/stream_interface.h>
 #include <haproxy/sample.h>
 
 /* Parse an IPv4 or IPv6 address and store it into the sample.

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 201de593da18596c8954f24f0d5a46fb5d4cc8ca..c429faa5a9a2bec5ead3e1924dd973e3ef04e8d7 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -24,13 +24,13 @@
 #include <haproxy/regex.h>
 #include <haproxy/session-t.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 
 #include <types/proxy.h>
 
 #include <proto/fcgi-app.h>
 #include <proto/log.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <haproxy/trace.h>
 
 /* FCGI Connection flags (32 bits) */

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 678853062ff0b1ab30683a28e862a1a206aa0bf9..ada8bb18b63567348a6f8e5b3aaba0fe1db284bb 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -27,7 +27,7 @@
 #include <proto/log.h>
 #include <haproxy/session-t.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/trace.h>
 
 /*

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 3497201bcd926a636b36a800d2d639e82171e6b7..34caea38da0412461f50ec1f795076a403175659 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -23,9 +23,9 @@
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/session-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/trace.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <import/eb32tree.h>
 
 

diff --git a/src/mworker.c b/src/mworker.c
index 3481c19808e8723e78bf5f4a09add270dd7d57f6..bccffaa58319c8de4a1c73a20bfff696c543b6e5 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -25,6 +25,7 @@
 #include <haproxy/mworker.h>
 #include <haproxy/peers.h>
 #include <haproxy/signal.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/version.h>
 
 #include <haproxy/global.h>
@@ -33,7 +34,6 @@
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 #if defined(USE_SYSTEMD)

diff --git a/src/peers.c b/src/peers.c
index 030a08240cdf7ae011ab794668892bc1bfcdc7a0..ee5b1caa70878dcf8ad770224fd7ee016203ffd2 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -32,6 +32,7 @@
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/thread.h>
@@ -42,7 +43,6 @@
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <haproxy/stick_table.h>
-#include <proto/stream_interface.h>
 
 
 /*******************************/

diff --git a/src/pool.c b/src/pool.c
index 1e87b750f9ab2f39c951eb75813485194779ccc5..a811c77e0a5feb4c2608b13d3f4e2c826f1f5610 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -21,13 +21,13 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/activity-t.h>
 
 #include <proto/channel.h>
 #include <proto/log.h>
-#include <proto/stream_interface.h>
 
 #ifdef CONFIG_HAP_LOCAL_POOLS
 /* These are the most common pools, expected to be initialized first. These

diff --git a/src/proxy.c b/src/proxy.c
index 94bce71a48d256c92c06f90b59d3c8d53338e26f..11f340d0a5fa77206cda7a7a0e38bb698f4675d5 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -28,6 +28,7 @@
 #include <haproxy/peers.h>
 #include <haproxy/pool.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/time.h>
 
@@ -46,7 +47,6 @@
 #include <proto/server.h>
 #include <haproxy/signal.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 int listeners; /* # of proxy listeners, set by cfgparse */

diff --git a/src/queue.c b/src/queue.c
index b863d645af96287d48131db885bb1ed57ff1abed..3b5d0ef4c7573da2a1777824060aed54541d8cda 100644 (file)
--- a/src/queue.c
+++ b/src/queue.c
@@ -73,6 +73,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
@@ -83,7 +84,6 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 #define NOW_OFFSET_BOUNDARY()          ((now_ms - (TIMER_LOOK_BACK >> 12)) & 0xfffff)

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 2f5b98d986efa648fc61a881a82be625e4979136..3453aac1ba6e968afc40fb37505cb04c5e40beb4 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -26,6 +26,7 @@
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
 #include <haproxy/global.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -34,7 +35,6 @@
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
 #include <haproxy/pipe.h>
-#include <proto/stream_interface.h>
 
 
 #if defined(USE_LINUX_SPLICE)

diff --git a/src/ring.c b/src/ring.c
index cdf91859b7de912baef96238c58ed916dfd3f7c7..437ee39290fcd87684933831210ad2e592a1aff6 100644 (file)
--- a/src/ring.c
+++ b/src/ring.c
@@ -25,7 +25,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/thread.h>
 #include <haproxy/ring.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 
 /* Creates and returns a ring buffer of size <size> bytes. Returns NULL on
  * allocation failure.

diff --git a/src/server.c b/src/server.c
index e8ed5a9af2c9ce1569cd75e8ce038343cd12dc36..7ac890513f6ca84c04e1324df34fd78b3df8052b 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -29,6 +29,7 @@
 #include <haproxy/namespace.h>
 #include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/time.h>
 
@@ -37,7 +38,6 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <netinet/tcp.h>
 
 #include <import/ebsttree.h>

diff --git a/src/sink.c b/src/sink.c
index 8408be7c6f09cd59073495ba0de73e9fa5cdff72..93beccf08b9bc6a1fba028907b26beb11d54dab2 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -28,7 +28,7 @@
 #include <haproxy/ring.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 
 struct list sink_list = LIST_HEAD_INIT(sink_list);
 

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index d0699ef8a2879c4c2bcb6478dd53d56f83e85e74..f971bee7ce5f14dcc39b15813da6ced866eff076 100644 (file)
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -27,12 +27,12 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <import/ebsttree.h>
 
 #include <proto/channel.h>
-#include <proto/stream_interface.h>
 
 /* Uncommitted CKCH transaction */
 

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 7036fdc35ac26a8fc4354ae68a3345e188dd5542..118a6d1bea1a6c277f4d59293d435f3819bafb94 100644 (file)
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -20,6 +20,7 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <dirent.h>
@@ -27,7 +28,6 @@
 #include <import/ebsttree.h>
 
 #include <proto/channel.h>
-#include <proto/stream_interface.h>
 
 /* release ssl bind conf */
 void ssl_sock_free_ssl_conf(struct ssl_bind_conf *conf)

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 914c22f16255172ab8c4867c754ac9a28997e362..88c60c773282fa26c2dda35747ce7b027057cc19 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -60,6 +60,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -77,7 +78,6 @@
 #include <haproxy/proto_tcp.h>
 #include <proto/http_ana.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>

diff --git a/src/stats.c b/src/stats.c
index 17d4ddaa9f7c71c392a9d85db312d8127e36d3d5..a4620563cb052137cb7d8f627c7eaef930702c97 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -45,6 +45,7 @@
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -62,7 +63,6 @@
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 
 /* status codes available for the stats admin page (strictly 4 chars length) */
 const char *stat_status_codes[STAT_STATUS_SIZE] = {

diff --git a/src/stick_table.c b/src/stick_table.c
index 736c8098e3a1c8c8c32df878fb140151850a267f..6bf6cd9a92f6a3fc9acf78900d590279e6c03f2f 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -24,6 +24,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/peers.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
@@ -39,7 +40,6 @@
 #include <proto/proxy.h>
 #include <haproxy/sample.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <haproxy/stick_table.h>
 
 /* structure used to return a table key built from a sample */

diff --git a/src/stream.c b/src/stream.c
index 5eced5b6a8d7a5e2f526ffcd58172b8000bb5f8d..32964f9b57df9e93ac69a1562ebe8e16b0a08a6a 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -36,6 +36,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
@@ -57,7 +58,6 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <haproxy/stick_table.h>
-#include <proto/stream_interface.h>
 
 DECLARE_POOL(pool_head_stream, "stream", sizeof(struct stream));
 DECLARE_POOL(pool_head_uniqueid, "uniqueid", UNIQUEID_LEN);

diff --git a/src/stream_interface.c b/src/stream_interface.c
index 5237954e60009fc6a94afed7d74b1a67a281f602..cbc8a23cf08d19a901c69dbf53bc4cfd43d77f74 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -24,6 +24,7 @@
 #include <haproxy/connection.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -33,7 +34,6 @@
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #include <haproxy/pipe-t.h>
 

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 85073691dfcb045cce74fe943d8a01de5c4ccc26..ef78d20177adb0483123e4306e27c03aac3568e1 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -18,6 +18,7 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -30,7 +31,6 @@
 #include <proto/proxy.h>
 #include <haproxy/stick_table.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 

diff --git a/src/tools.c b/src/tools.c
index 59903b1fd96af542c19f2e3cb1f1fc6c79da806d..52522cb3e3c2a85ac00063428b48208926e7baeb 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -47,10 +47,10 @@
 #include <haproxy/listener.h>
 #include <haproxy/namespace.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/proto_udp.h>
-#include <proto/stream_interface.h>
 
 /* This macro returns false if the test __x is false. Many
  * of the following parsing function must be abort the processing

diff --git a/src/xprt_handshake.c b/src/xprt_handshake.c
index 1290d23baf643caad79355736093074276eb8ca3..752a4f3aec2e70c216cb14baaede3c6470f4dc94 100644 (file)
--- a/src/xprt_handshake.c
+++ b/src/xprt_handshake.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/connection.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 
 struct xprt_handshake_ctx {
        struct connection *conn;