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

This one is particularly tricky to move because everyone uses it
and it depends on a lot of other types. For example it cannot include
arg-t.h and must absolutely only rely on forward declarations to avoid
dependency loops between vars -> sample_data -> arg. In order to address
this one, it would be nice to split the sample_data part out of sample.h.

diff --git a/contrib/mod_defender/defender.h b/contrib/mod_defender/defender.h
index 088416e57a2371725e42e6cbc15d9dab543e0667..59241b22b09d02ad6aaf09277740fab85f837276 100644 (file)
--- a/contrib/mod_defender/defender.h
+++ b/contrib/mod_defender/defender.h
@@ -12,7 +12,7 @@
 #ifndef __DEFENDER_H__
 #define __DEFENDER_H__
 
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 struct defender_request {
        struct sample clientip;

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index cdced5639f6cf9eaef1dbc845379ea3244db88c0..fa36aa7f051e9fce0cc9e48974ee72270ba30f3e 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -31,7 +31,7 @@
 #include <haproxy/compression.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/server.h>
 #include <proto/ssl_sock.h>
 #include <proto/stats.h>

diff --git a/include/haproxy/auth.h b/include/haproxy/auth.h
index 3eafa410e582d81f7d94c89e46defabd3d43ef97..d7ec2f7229d15adf945c76ccf70bff7de4bf03fb 100644 (file)
--- a/include/haproxy/auth.h
+++ b/include/haproxy/auth.h
@@ -17,7 +17,7 @@
 #include <haproxy/auth-t.h>
 #include <haproxy/api.h>
 #include <haproxy/pattern-t.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 extern struct userlist *userlist;
 

diff --git a/include/haproxy/map-t.h b/include/haproxy/map-t.h
index 902b064a25216cbf6a4f8a02a5c2004e1af2630c..d6085ee6beaea7e714041c5fafd23c3bc08635e5 100644 (file)
--- a/include/haproxy/map-t.h
+++ b/include/haproxy/map-t.h
@@ -23,7 +23,7 @@
 #define _HAPROXY_MAP_T_H
 
 #include <haproxy/pattern-t.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 struct map_descriptor {
        struct sample_conv *conv;      /* original converter descriptor */

diff --git a/include/haproxy/map.h b/include/haproxy/map.h
index 140148c33dab668ba7204c040ef2f3353e7e311b..3ec3418d87a2d38350234c17a166051cc16dd8c6 100644 (file)
--- a/include/haproxy/map.h
+++ b/include/haproxy/map.h
@@ -23,7 +23,7 @@
 #define _HAPROXY_MAP_H
 
 #include <haproxy/map-t.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 /* maps output sample parser */
 int map_parse_ip(const char *text, struct sample_data *data);

diff --git a/include/haproxy/pattern-t.h b/include/haproxy/pattern-t.h
index 7787ec30b38827c3520cd9cc21b329e7b3e7c19f..a977527a17077e83088778b2bfa26d33f769a435 100644 (file)
--- a/include/haproxy/pattern-t.h
+++ b/include/haproxy/pattern-t.h
@@ -29,7 +29,7 @@
 #include <haproxy/thread-t.h>
 #include <haproxy/api-t.h>
 
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 
 /* Pattern matching function result.

diff --git a/include/haproxy/payload.h b/include/haproxy/payload.h
index a99adf0ca981e983ff2cb6eaf8f9ec1dcc2399eb..da5b4e117170a4f902fcf9204691bb60b415aa7d 100644 (file)
--- a/include/haproxy/payload.h
+++ b/include/haproxy/payload.h
@@ -23,7 +23,7 @@
 #define _HAPROXY_PAYLOAD_H
 
 #include <haproxy/api.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 #include <types/stream.h>
 
 int fetch_rdp_cookie_name(struct stream *s, struct sample *smp, const char *cname, int clen);

diff --git a/include/types/sample.h b/include/haproxy/sample-t.h
similarity index 98%
rename from include/types/sample.h
rename to include/haproxy/sample-t.h
index 0bec0c4f90ef68819741dfb1baad7e332e66ac19..9403d7bff288b0a8922a0c4d23008e9e4fb6dfe4 100644 (file)
--- a/include/types/sample.h
+++ b/include/haproxy/sample-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/sample.h
+ * include/haproxy/sample-t.h
  * Macros, variables and structures for sample management.
  *
  * Copyright (C) 2009-2010 EXCELIANCE, Emeric Brun <ebrun@exceliance.fr>
@@ -20,18 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_SAMPLE_H
-#define _TYPES_SAMPLE_H
+#ifndef _HAPROXY_SAMPLE_T_H
+#define _HAPROXY_SAMPLE_T_H
 
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/http-t.h>
 #include <haproxy/list-t.h>
 
-struct arg;
-
 /* input and output sample types */
 enum {
        SMP_T_ANY = 0,   /* any type */
@@ -179,8 +178,6 @@ enum {
                             SMP_VAL_BE_CHK_RUL,
 };
 
-extern const unsigned int fetch_cap[SMP_SRC_ENTRIES];
-
 /* Sample fetch options are passed to sample fetch functions to add precision
  * about what is desired :
  *   - fetch direction (req/resp)
@@ -213,6 +210,7 @@ enum {
 /* needed below */
 struct session;
 struct stream;
+struct arg;
 
 /* a sample context might be used by any sample fetch function in order to
  * store information needed across multiple calls (eg: restart point for a
@@ -326,6 +324,5 @@ struct sample_conv_kw_list {
 };
 
 typedef int (*sample_cast_fct)(struct sample *smp);
-extern sample_cast_fct sample_casts[SMP_TYPES][SMP_TYPES];
 
-#endif /* _TYPES_SAMPLE_H */
+#endif /* _HAPROXY_SAMPLE_T_H */

diff --git a/include/proto/sample.h b/include/haproxy/sample.h
similarity index 94%
rename from include/proto/sample.h
rename to include/haproxy/sample.h
index b4d52c5ea4139d3f359c2218ba7b34c7fba4fbbd..1c30fd4a43ec2ee215aa87a27c932726b54c8483 100644 (file)
--- a/include/proto/sample.h
+++ b/include/haproxy/sample.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/sample.h
+ * include/haproxy/sample.h
  * Functions for samples management.
  *
  * Copyright (C) 2009-2010 EXCELIANCE, Emeric Brun <ebrun@exceliance.fr>
@@ -20,12 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_SAMPLE_H
-#define _PROTO_SAMPLE_H
+#ifndef _HAPROXY_SAMPLE_H
+#define _HAPROXY_SAMPLE_H
 
-#include <types/sample.h>
+#include <haproxy/arg-t.h>
+#include <haproxy/api.h>
+#include <haproxy/sample-t.h>
 #include <types/stick_table.h>
 
+extern sample_cast_fct sample_casts[SMP_TYPES][SMP_TYPES];
+extern const unsigned int fetch_cap[SMP_SRC_ENTRIES];
 extern const char *smp_to_type[SMP_TYPES];
 
 struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, int line, char **err, struct arg_list *al, char **endptr);
@@ -170,4 +174,4 @@ int smp_make_rw(struct sample *smp)
        return smp && (smp_is_rw(smp) || smp_dup(smp));
 }
 
-#endif /* _PROTO_SAMPLE_H */
+#endif /* _HAPROXY_SAMPLE_H */

diff --git a/include/proto/acl.h b/include/proto/acl.h
index 28b49c448e1a6ced5db2b0d615abb48d43b9f8b0..56ae22899d1b352baca1b587ef43994b07993787 100644 (file)
--- a/include/proto/acl.h
+++ b/include/proto/acl.h
@@ -24,7 +24,6 @@
 
 #include <haproxy/api.h>
 #include <types/acl.h>
-#include <proto/sample.h>
 
 /*
  * FIXME: we need destructor functions too !

diff --git a/include/proto/http_fetch.h b/include/proto/http_fetch.h
index e631bc03a9b11949c3c4d5bac4ae970608f2df6e..3a7261aa89d6cf11bb2372f25e7c79dba4c7eb58 100644 (file)
--- a/include/proto/http_fetch.h
+++ b/include/proto/http_fetch.h
@@ -27,7 +27,7 @@
 #include <haproxy/arg-t.h>
 #include <types/channel.h>
 #include <types/checks.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 struct htx *smp_prefetch_htx(struct sample *smp, struct channel *chn, struct check *check, int vol);
 int val_hdr(struct arg *arg, char **err_msg);

diff --git a/include/proto/protocol_buffers.h b/include/proto/protocol_buffers.h
index 3e1571a308b71d7e5272613b8b608f12330a12d2..16ccee57753459b9ee504dcd97d47058ddb6b5b2 100644 (file)
--- a/include/proto/protocol_buffers.h
+++ b/include/proto/protocol_buffers.h
@@ -24,8 +24,8 @@
 
 #include <inttypes.h>
 #include <haproxy/arg-t.h>
+#include <haproxy/sample-t.h>
 #include <types/protocol_buffers.h>
-#include <proto/sample.h>
 
 #define PBUF_VARINT_DONT_STOP_BIT       7
 #define PBUF_VARINT_DONT_STOP_BITMASK  (1 << PBUF_VARINT_DONT_STOP_BIT)

diff --git a/include/proto/spoe.h b/include/proto/spoe.h
index 584b38af86b075e31128e2463fa4d8946dd17811..d9e90982016249f8ce8494b60271c9097a955e35 100644 (file)
--- a/include/proto/spoe.h
+++ b/include/proto/spoe.h
@@ -23,11 +23,10 @@
 #define _PROTO_SPOE_H
 
 #include <haproxy/intops.h>
+#include <haproxy/sample-t.h>
 
 #include <types/spoe.h>
 
-#include <proto/sample.h>
-
 
 /* Encode a buffer. Its length <len> is encoded as a varint, followed by a copy
  * of <str>. It must have enough space in <*buf> to encode the buffer, else an

diff --git a/include/types/checks.h b/include/types/checks.h
index 80f6321f2df12bb8f6bd9c8046884fce5b19b607..9b914d00d61809ced31ba79dd8475b0ca4dc243b 100644 (file)
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -24,7 +24,7 @@
 
 #include <types/connection.h>
 #include <types/proxy.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 #include <types/server.h>
 #include <types/session.h>
 #include <types/task.h>

diff --git a/include/types/protocol_buffers.h b/include/types/protocol_buffers.h
index 8509b01c4bd7c56364690384467a21092993256c..35e8444ccfb0dc0c0d2b46d972c9e91c449b3561 100644 (file)
--- a/include/types/protocol_buffers.h
+++ b/include/types/protocol_buffers.h
@@ -68,6 +68,7 @@ struct pbuf_fid {
        size_t sz;
 };
 
+struct sample;
 struct protobuf_parser_def {
        int (*skip)(unsigned char **pos, size_t *left, size_t vlen);
        int (*smp_store)(struct sample *, int type,

diff --git a/include/types/proxy.h b/include/types/proxy.h
index af33021b1bde5e6b770a5fe00f7ef3bd241ac171..a72232f6a371fe85bcb6c7d2fa3b5c52fc9e7456 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -44,7 +44,7 @@
 #include <types/filters.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/log.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 #include <types/server.h>
 #include <types/stick_table.h>
 

diff --git a/include/types/spoe.h b/include/types/spoe.h
index f08b9adcdd81621bda49e183592dd6dcd3e9ee6c..fdaba93eac55bedd37cc387e3b69d8c3e14b8700 100644 (file)
--- a/include/types/spoe.h
+++ b/include/types/spoe.h
@@ -32,7 +32,7 @@
 #include <haproxy/freq_ctr-t.h>
 #include <types/log.h>
 #include <types/proxy.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 #include <types/stream.h>
 #include <types/task.h>
 

diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index e34504800a75114f66e4516a49713499e4f0fa5e..0ee7b95f7481edb6705856a8de559ce82652e714 100644 (file)
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -33,7 +33,7 @@
 #include <haproxy/pool-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/peers.h>
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 /* The types of extra data we can store in a stick table */
 enum {

diff --git a/include/types/vars.h b/include/types/vars.h
index 62b944b258d15df81f434ef312fdac6d093e2779..d8ec71c61b9394d93dd74c2e45f08905ea8c2499 100644 (file)
--- a/include/types/vars.h
+++ b/include/types/vars.h
@@ -4,7 +4,7 @@
 #include <haproxy/list-t.h>
 #include <haproxy/thread.h>
 
-#include <types/sample.h>
+#include <haproxy/sample-t.h>
 
 enum vars_scope {
        SCOPE_SESS = 0,

diff --git a/src/51d.c b/src/51d.c
index ceff8283ee5a012f5573087647a3c6d0e5daf4a3..2309592ddb8dbc0884ec4ac8b5c67417dfc0762d 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -12,7 +12,7 @@
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <import/xxhash.h>
 #include <import/lru.h>
 #include <51Degrees.h>

diff --git a/src/acl.c b/src/acl.c
index 17a5e104154e13a2e3714f4fc42210037cd121a9..d2187e8e5d42c4eed0eb0ee245c2a3ec98c7b327 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -28,7 +28,7 @@
 #include <proto/channel.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/stick_table.h>
 
 #include <import/ebsttree.h>

diff --git a/src/backend.c b/src/backend.c
index 6c6c26d81b9b788a4b1d4bf109a5c57a2fb0501d..e12f207e4d3f1b413dddb36cafbb4cae512f4145 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -49,7 +49,7 @@
 #include <proto/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/server.h>
 #include <proto/session.h>
 #include <proto/stream.h>

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index d2bd8d45bfa21020eb43f1028cfd4f6081b81bab..0e255af568fd4f9ae5d9154f60f450401918e18f 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -19,6 +19,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/listener.h>
+#include <haproxy/sample.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 1dfdbc21cfddbdd564bdfa47741a927c15a86eea..6c675c4b8d5ef3d8973f5799f0c796800676e0a1 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -74,7 +74,7 @@
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/peers.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/session.h>
 #include <proto/server.h>
 #include <proto/stream.h>

diff --git a/src/checks.c b/src/checks.c
index 2e4c4b0c2b514682cb8fc820a9a7afce64614adf..d742969684687de829b1f8fecf88a2f977ebfbcb 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -68,7 +68,7 @@
 #include <proto/log.h>
 #include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 
 static int tcpcheck_get_step_id(struct check *, struct tcpcheck_rule *);
 

diff --git a/src/cli.c b/src/cli.c
index 69f1ec41f8435fb3131c237c33b312787d5c6ae0..f5f197f9708cf0d9f85d61f002c936c76e0b31f8 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -34,6 +34,7 @@
 #include <haproxy/listener.h>
 #include <haproxy/mworker-t.h>
 #include <haproxy/pattern-t.h>
+#include <haproxy/sample-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -58,7 +59,6 @@
 #include <haproxy/pipe.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
 #include <proto/session.h>
 #include <proto/stream.h>
 #include <proto/server.h>

diff --git a/src/connection.c b/src/connection.c
index afe881cd9b5ebcb9305d2f69a9b6580548cc713d..5652a25883a21e277380d309a897407abedf1198 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -23,7 +23,7 @@
 #include <haproxy/fd.h>
 #include <proto/proto_tcp.h>
 #include <proto/stream_interface.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/ssl_sock.h>
 
 

diff --git a/src/da.c b/src/da.c
index 8ff5bfac44e29a28dae6893b7e7f9d18efb1480e..aef12a2fe346dd90c38fa8d1d1bd3932e5782eb8 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -10,7 +10,7 @@
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <dac.h>
 
 static struct {

diff --git a/src/dns.c b/src/dns.c
index 32c4efa36446c251dde9ffb1c87b95268d537fac..e176b789d655e4f10feda5a5e1986db82612c3fe 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -25,6 +25,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/sample.h>
 #include <haproxy/time.h>
 #include <haproxy/ticks.h>
 #include <haproxy/net_helper.h>
@@ -40,7 +41,6 @@
 #include <haproxy/fd.h>
 #include <proto/http_ana.h>
 #include <proto/log.h>
-#include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/task.h>
 #include <haproxy/proto_udp.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index d9f6bdbe24bab035da0807ff649315dfa2052e2b..6d02e897aa02e16aa8182a0587ad87b85e25ff5e 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -16,6 +16,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 
 #include <types/global.h>
@@ -26,7 +27,6 @@
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/session.h>
 

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index c081e2790df880262818efa17b364aee13a5334d..5ab6a01c78815ff9707dfd50c2fd00049e6f87f5 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -18,15 +18,14 @@
 #include <common/cfgparse.h>
 #include <haproxy/htx.h>
 #include <haproxy/list.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 
 #include <types/filters.h>
 #include <types/proxy.h>
-#include <types/sample.h>
 
 #include <proto/filters.h>
 #include <proto/http_ana.h>
-#include <proto/sample.h>
 #include <proto/stream.h>
 
 const char *http_comp_flt_id = "compression filter";

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 9f69f9f2e04151d1da6e9536b0e7e24b4a72db16..010dac2a5619d8e9d722e4b52c5a36a0e8658d03 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -17,6 +17,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/sample.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/time.h>
@@ -33,7 +34,6 @@
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
 #include <proto/session.h>
 #include <proto/signal.h>
 #include <proto/spoe.h>

diff --git a/src/frontend.c b/src/frontend.c
index 0be29292d16b6625d647d406859d597c483c6b3f..00c31d84e1019e46fb46c1a0e060d23ba4f0ff02 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -25,6 +25,7 @@
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
 #include <haproxy/frontend.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
@@ -38,7 +39,6 @@
 #include <proto/proto_tcp.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <proto/task.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 9e6627c578c65befdd8e8ae2408f98167aceb231..60c5f65cb883d576f213c1b2699377759a347f17 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -98,6 +98,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern.h>
+#include <haproxy/sample.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>

diff --git a/src/hlua.c b/src/hlua.c
index 69d84bd6bb8b01d07570b0611e6f2e3d35710827..5b670c741a285198230955dd059d1aa166c589fe 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -37,6 +37,7 @@
 #include <haproxy/obj_type.h>
 #include <haproxy/pattern.h>
 #include <haproxy/payload.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 
 #include <types/cli.h>
@@ -52,7 +53,6 @@
 #include <proto/http_fetch.h>
 #include <proto/queue.h>
 #include <proto/http_ana.h>
-#include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/session.h>
 #include <proto/stream.h>

diff --git a/src/http_act.c b/src/http_act.c
index f2b803ec36457f82f166d4f23116407d6d17f546..0549bc018da02e2d746b4031e238bc3549f7a933 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -26,6 +26,7 @@
 #include <haproxy/pattern.h>
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <common/uri_auth.h>
 #include <haproxy/version.h>

diff --git a/src/http_conv.c b/src/http_conv.c
index da7d53f9347066a0bf7a84fd9d36f608f8236dab..730809a9f6f0ca010959593d3872379e33a55a26 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -20,6 +20,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/http.h>
 #include <haproxy/pool.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
@@ -27,7 +28,6 @@
 #include <types/global.h>
 
 #include <haproxy/arg.h>
-#include <proto/sample.h>
 #include <proto/stream.h>
 
 static int smp_check_http_date_unit(struct arg *args, struct sample_conv *conv,

diff --git a/src/http_fetch.c b/src/http_fetch.c
index e85978bad276c145c8bd1d6eecb3d672aff422f5..634847aee6d5966fae5dcd0e54cf45d1af3e1783 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -27,6 +27,7 @@
 #include <haproxy/htx.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
@@ -38,7 +39,6 @@
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
-#include <proto/sample.h>
 #include <proto/stream.h>
 
 

diff --git a/src/http_htx.c b/src/http_htx.c
index 8524d8af502bf633ff80c1673c7a2fd574a10899..d018ca5b0d47722904c0a1437698cfbbe7c6baeb 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <types/global.h>
 
 #include <common/cfgparse.h>
@@ -26,7 +27,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/http_fetch.h>
-#include <proto/sample.h>
 
 struct buffer http_err_chunks[HTTP_ERR_SIZE];
 struct http_reply http_err_replies[HTTP_ERR_SIZE];

diff --git a/src/http_rules.c b/src/http_rules.c
index 2ec91d9d5e0dbedfea78a4b7182bb95bcc8c0a22..79c9936ff4432ef4da80f832d869418488376bb8 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -32,7 +32,7 @@
 #include <proto/acl.h>
 #include <haproxy/arg.h>
 #include <proto/http_ana.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 
 
 /* List head of all known action keywords for "http-request" */

diff --git a/src/listener.c b/src/listener.c
index 152473e085a112be70d901e821af5744533dbeb2..3f6230ffb59803d45d100e1377a8f066daf4f22f 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -36,7 +36,7 @@
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proto_sockpair.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/stream.h>
 #include <proto/task.h>
 

diff --git a/src/log.c b/src/log.c
index 7c62f6dfadc793b5a29b7f6913fbaf5cfe24d172..2bc0990c3da340156bf24ac505aa19b722d4b6e3 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -40,7 +40,7 @@
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <haproxy/ring.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <haproxy/sink.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream.h>

diff --git a/src/map.c b/src/map.c
index 0066257d66b0cdeec79bdeb3ed849e88ffed3560..33f24dd9fb196f13a553d006bb4fa583741a845e 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -28,7 +28,7 @@
 #include <proto/cli.h>
 #include <proto/log.h>
 #include <proto/stream_interface.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 
 /* Parse an IPv4 or IPv6 address and store it into the sample.
  * The output type is IPv4 or IPv6.

diff --git a/src/pattern.c b/src/pattern.c
index e6250b38026076b5cae2032b1beba1faac0eef2e..93972341a4b6c4ce324bacae5ee9d968b3f20bd1 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -23,7 +23,7 @@
 #include <types/global.h>
 
 #include <proto/log.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 
 #include <import/ebsttree.h>
 #include <import/lru.h>

diff --git a/src/payload.c b/src/payload.c
index 3d176d6632bde4960e942616b27a44bb9d2c2795..af4ae1caba139d3e64ad58ee7bab9ceb229281c7 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -22,7 +22,7 @@
 #include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/http_ana.h>
 
 

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 2988007f4643e41e2354ab0647382fa70c9e6337..de001c2a5e402588caa88faffa38b08391637b4f 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -36,6 +36,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/namespace.h>
 
@@ -53,7 +54,6 @@
 #include <proto/http_ana.h>
 #include <proto/proto_tcp.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/task.h>
 #include <proto/tcp_rules.h>

diff --git a/src/queue.c b/src/queue.c
index 83863990dbc1b60e270a5a34cdcda55a2d0a5cfb..bbf11e22d86235c3af0ba5994a514a9339c43a47 100644 (file)
--- a/src/queue.c
+++ b/src/queue.c
@@ -72,13 +72,13 @@
 #include <haproxy/api.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
+#include <haproxy/sample.h>
 #include <haproxy/time.h>
 #include <haproxy/thread.h>
 #include <import/eb32tree.h>
 
 #include <proto/http_ana.h>
 #include <proto/queue.h>
-#include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>

diff --git a/src/sample.c b/src/sample.c
index c13a1ead12c06ca637374019a6cbaa309abf5a30..871db000f26362da80c0cd379c22121a908dfcbe 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -26,6 +26,7 @@
 #include <haproxy/http.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <common/uri_auth.h>
 #include <haproxy/base64.h>
@@ -34,7 +35,6 @@
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/protocol_buffers.h>
-#include <proto/sample.h>
 #include <haproxy/sink.h>
 #include <proto/stick_table.h>
 #include <proto/vars.h>

diff --git a/src/server.c b/src/server.c
index 468814c408beaaae7b458579c1389b42321357a6..ae4f044b7236aa22a3f3ac25ab5c8cc391b59da0 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -22,6 +22,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/namespace.h>
+#include <haproxy/sample.h>
 #include <haproxy/time.h>
 
 #include <types/applet.h>
@@ -37,7 +38,6 @@
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
 #include <proto/queue.h>
-#include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index f27b2e6b50fe082ebd75a87f289e7b0bc0431d7a..509b0c57567d99446e86bb02262e8718ef97d46c 100644 (file)
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -24,16 +24,15 @@
 #include <haproxy/buf-t.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/openssl-compat.h>
+#include <haproxy/sample.h>
 #include <haproxy/ssl_utils.h>
 #include <haproxy/tools.h>
 
-#include <types/sample.h>
 #include <types/ssl_sock.h>
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>
 #include <proto/ssl_sock.h>
-#include <proto/sample.h>
 
 
 /***** Below are some sample fetching functions for ACL/patterns *****/

diff --git a/src/stats.c b/src/stats.c
index b0ee43428743ae0456b48579ea07f5b3cb3adc8e..6e5393402fd6b214f79f314b56083cf72b40c2da 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -60,7 +60,6 @@
 #include <proto/log.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
 #include <proto/session.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 011a6a314b0b11539fb2b1bcb98825b59af729f4..7026e39ca719d3c35df1a76e04c06c13781f02a0 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -36,7 +36,7 @@
 #include <proto/http_ana.h>
 #include <proto/proto_tcp.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <proto/stick_table.h>

diff --git a/src/stream.c b/src/stream.c
index 8e7697992525e6d50d3ea78e934eb4b07c8d2f9d..b3e71480a9f1b350a47999769efb5719e155e1b6 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -55,7 +55,6 @@
 #include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
-#include <proto/sample.h>
 #include <proto/stick_table.h>
 #include <proto/stream_interface.h>
 #include <proto/task.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 6cd87efa07ab10197a73f07f08c339bb5ed6de08..6a878fb7d11907d4a5bae84fd168a417f91920db 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -14,6 +14,7 @@
 #include <haproxy/capture-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -27,7 +28,6 @@
 #include <proto/connection.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
-#include <proto/sample.h>
 #include <proto/stick_table.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>

diff --git a/src/vars.c b/src/vars.c
index 8cc4c4893bcde064698c6716e78a767192afed71..f69dbbbcca0e5e0d601554c939eb0be895876212 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -5,12 +5,12 @@
 #include <haproxy/http.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
+#include <haproxy/sample.h>
 
 #include <types/vars.h>
 
 #include <haproxy/arg.h>
 #include <proto/http_ana.h>
-#include <proto/sample.h>
 #include <proto/stream.h>
 #include <proto/tcp_rules.h>
 #include <proto/vars.h>

diff --git a/src/wurfl.c b/src/wurfl.c
index 78288bee6ba1637c2f9098504bb76597533b3abb..43cedf5102cf04b909b2a190304074a06b237e4c 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -12,7 +12,7 @@
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/http_fetch.h>
-#include <proto/sample.h>
+#include <haproxy/sample.h>
 #include <import/ebsttree.h>
 #include <import/ebmbtree.h>