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

Just a minor change, moved the macro definitions upwards. A few caller
files were updated since they didn't need to include it.

diff --git a/include/types/filters.h b/include/haproxy/filters-t.h
similarity index 98%
rename from include/types/filters.h
rename to include/haproxy/filters-t.h
index 2e06b83163f5f6da360ba37ae9b677afcbce2042..a158d22db71c4e030257da7d8916e560ffdd420a 100644 (file)
--- a/include/types/filters.h
+++ b/include/haproxy/filters-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/filteers.h
+ * include/haproxy/filteers-t.h
  * This file defines everything related to stream filters.
  *
  * Copyright (C) 2015 Qualys Inc., Christopher Faulet <cfaulet@qualys.com>
@@ -18,11 +18,23 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#ifndef _TYPES_FILTERS_H
-#define _TYPES_FILTERS_H
+#ifndef _HAPROXY_FILTERS_T_H
+#define _HAPROXY_FILTERS_T_H
 
-#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/api-t.h>
+
+/* Flags set on a filter config */
+#define FLT_CFG_FL_HTX    0x00000001  /* The filter can filter HTX streams */
+
+/* Flags set on a filter instance */
+#define FLT_FL_IS_BACKEND_FILTER  0x0001 /* The filter is a backend filter */
+#define FLT_FL_IS_REQ_DATA_FILTER 0x0002 /* The filter will parse data on the request channel */
+#define FLT_FL_IS_RSP_DATA_FILTER 0x0004 /* The filter will parse data on the response channel */
+
+/* Flags set on the stream, common to all filters attached to its stream */
+#define STRM_FLT_FL_HAS_FILTERS          0x0001 /* The stream has at least one filter */
+
 
 struct http_msg;
 struct proxy;
@@ -189,17 +201,6 @@ struct flt_ops {
                                    unsigned int offset, unsigned int len);
 };
 
-/* Flags set on a filter config */
-#define FLT_CFG_FL_HTX    0x00000001  /* The filter can filter HTX streams */
-
-/* Flags set on a filter instance */
-#define FLT_FL_IS_BACKEND_FILTER  0x0001 /* The filter is a backend filter */
-#define FLT_FL_IS_REQ_DATA_FILTER 0x0002 /* The filter will parse data on the request channel */
-#define FLT_FL_IS_RSP_DATA_FILTER 0x0004 /* The filter will parse data on the response channel */
-
-/* Flags set on the stream, common to all filters attached to its stream */
-#define STRM_FLT_FL_HAS_FILTERS          0x0001 /* The stream has at least one filter */
-
 /*
  * Structure representing the filter configuration, attached to a proxy and
  * accessible from a filter when instantiated in a stream
@@ -247,7 +248,7 @@ struct strm_flt {
        unsigned long long offset[2];
 };
 
-#endif /* _TYPES_FILTERS_H */
+#endif /* _HAPROXY_FILTERS_T_H */
 
 /*
  * Local variables:

diff --git a/include/proto/filters.h b/include/haproxy/filters.h
similarity index 97%
rename from include/proto/filters.h
rename to include/haproxy/filters.h
index 4b8876ea8196b896e4f3fe2052a656b634ded8cd..b9f24bfc720c332e7e72a873456782cd31b80890 100644 (file)
--- a/include/proto/filters.h
+++ b/include/haproxy/filters.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/filters.h
+ * include/haproxy/filters.h
  * This file defines function prototypes for stream filters management.
  *
  * Copyright (C) 2015 Qualys Inc., Christopher Faulet <cfaulet@qualys.com>
@@ -18,11 +18,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#ifndef _PROTO_FILTERS_H
-#define _PROTO_FILTERS_H
+#ifndef _HAPROXY_FILTERS_H
+#define _HAPROXY_FILTERS_H
 
 #include <haproxy/channel.h>
-#include <types/filters.h>
+#include <haproxy/filters-t.h>
 #include <haproxy/http_ana-t.h>
 #include <types/proxy.h>
 #include <types/stream.h>
@@ -186,5 +186,4 @@ flt_update_offsets(struct filter *filter, struct channel *chn, int len)
        }
 }
 
-
-#endif /* _PROTO_FILTERS_H */
+#endif /* _HAPROXY_FILTERS_H */

diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h
index b314d69e0a5ca384db329b903a202608d04b9901..4d1581b48b15b356ae523322a19f97a304ab5b26 100644 (file)
--- a/include/types/fcgi-app.h
+++ b/include/types/fcgi-app.h
@@ -26,13 +26,12 @@
 #include <haproxy/api-t.h>
 #include <import/ist.h>
 #include <haproxy/fcgi.h>
+#include <haproxy/filters-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
 
 #include <import/ebistree.h>
 
-#include <types/filters.h>
-
 #define FCGI_APP_FL_KEEP_CONN     0x00000001 /* Keep the connection alive */
 #define FCGI_APP_FL_GET_VALUES    0x00000002 /* Retrieve FCGI variables on connection establishment */
 #define FCGI_APP_FL_MPXS_CONNS    0x00000004 /* FCGI APP supports connection multiplexing */

diff --git a/include/types/proxy.h b/include/types/proxy.h
index 53d9e3c0dbb9b3266a1d211fc98476a93c0ca3a7..b86df8d92d40b0b6f29b3845758cfa3fe51aaefe 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -42,7 +42,6 @@
 
 #include <haproxy/acl-t.h>
 #include <types/backend.h>
-#include <types/filters.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/log.h>
 #include <haproxy/sample-t.h>

diff --git a/include/types/spoe.h b/include/types/spoe.h
index c7ed45d5a3cad2bc5efddf687129bfdc269609a3..1538a729a96634aae76da6dd38a25c5624a8aec1 100644 (file)
--- a/include/types/spoe.h
+++ b/include/types/spoe.h
@@ -25,10 +25,10 @@
 #include <sys/time.h>
 
 #include <haproxy/dynbuf-t.h>
+#include <haproxy/filters-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/thread.h>
 
-#include <types/filters.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/log.h>
 #include <types/proxy.h>

diff --git a/include/types/stream.h b/include/types/stream.h
index 99dfd02ecc3ce467e5c5331ff207ac98a0c80a49..41b800cf34415b89118deec9fce4d66a5a5b2062 100644 (file)
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -31,6 +31,7 @@
 #include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/dynbuf-t.h>
+#include <haproxy/filters-t.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/list-t.h>
@@ -39,7 +40,6 @@
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/vars-t.h>
 
-#include <types/filters.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>

diff --git a/src/cache.c b/src/cache.c
index 36c54a880d13b8afc3ed19ead24352c08ceccf05..17d015afa4c6ed7cbf3fd1732e4ab9e396133148 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -14,6 +14,7 @@
 #include <haproxy/api.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
+#include <haproxy/filters.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
@@ -22,11 +23,9 @@
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
-#include <types/filters.h>
 #include <types/proxy.h>
 
 #include <proto/proxy.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/stream.h>
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index e5cac8b114789273b5913a305517a0a56c4bbad7..8bd60b7cbd68d819f689c30eac306611bd3f1bd1 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -45,6 +45,7 @@
 #include <haproxy/connection.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
@@ -67,11 +68,9 @@
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
 
-#include <types/filters.h>
 #include <haproxy/global.h>
 
 #include <proto/backend.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index dda4b3a998c22a328fbb7c2a935b74d73651ee76..9097dab9d8f58ac9f1fe7d17f3d8360cfc2dde3d 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -15,6 +15,7 @@
 #include <haproxy/chunk.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/regex.h>
@@ -25,7 +26,6 @@
 #include <haproxy/global.h>
 
 #include <proto/fcgi-app.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>

diff --git a/src/filters.c b/src/filters.c
index 130f5d71a402ce57a5b66773e5789171f234f938..b6587392557799881272d4f7f88a1e30260c99ec 100644 (file)
--- a/src/filters.c
+++ b/src/filters.c
@@ -14,6 +14,7 @@
 #include <haproxy/buf-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/flt_http_comp.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
@@ -22,10 +23,7 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
-#include <types/filters.h>
-
 #include <haproxy/compression.h>
-#include <proto/filters.h>
 #include <haproxy/http_ana.h>
 #include <proto/stream.h>
 

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 0fb213d08f3cbb25b471778059d676b6a63a3da9..1b8fffb5979f7cddc40dd06ac6941bb4db825716 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -13,6 +13,7 @@
 #include <haproxy/api.h>
 #include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/filters.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
@@ -22,10 +23,8 @@
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 
-#include <types/filters.h>
 #include <types/proxy.h>
 
-#include <proto/filters.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 9e9eaeb8f4dad52cee48ff45590415200b5ac28f..f532d2d8516bb3da15e41f2e25162a781b883a65 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -16,6 +16,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/filters.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/sample.h>
@@ -35,7 +36,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/backend.h>
-#include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
 #include <proto/proxy.h>

diff --git a/src/flt_trace.c b/src/flt_trace.c
index 125401a38c55f077187ba60939a27723f0dada01..2f55b73d1a1977f876249a26d00b36625d2b916c 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -14,18 +14,17 @@
 
 #include <haproxy/api.h>
 #include <haproxy/channel-t.h>
+#include <haproxy/filters.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
-#include <types/filters.h>
 #include <haproxy/global.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/stream.h>
 

diff --git a/src/haproxy.c b/src/haproxy.c
index 6370d8e59f14bb40d7b1cc357e22650e23729c24..6488df9b3afa4117fd44b94dc5606f29ed16b582 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -91,6 +91,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/hlua.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
@@ -116,14 +117,12 @@
 #include <haproxy/vars.h>
 
 #include <haproxy/capture-t.h>
-#include <types/filters.h>
 #include <haproxy/global.h>
 
 #include <haproxy/activity.h>
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>

diff --git a/src/http_ana.c b/src/http_ana.c
index 6e15d67303cfa9ed8ab0a5254b4898203e50ed67..8e8dd2fa0f62048945306c1361e6b79b1db06c53 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -17,6 +17,7 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
+#include <haproxy/filters.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
@@ -30,7 +31,6 @@
 
 #include <haproxy/capture-t.h>
 
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>

diff --git a/src/proxy.c b/src/proxy.c
index 803f1868ae14e0cd2fa55330a4208aaaa5899446..78d91e6e25e5e1066253436fc8bb7210b21d026f 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -22,6 +22,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
+#include <haproxy/filters.h>
 #include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/listener.h>
@@ -40,7 +41,6 @@
 
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>

diff --git a/src/stream.c b/src/stream.c
index 010509fb5cc9eee66dc8f7e64cee2304c056992c..fc2798d098c5726444906ab8754cf83fc8692b62 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -27,6 +27,7 @@
 #include <haproxy/dict.h>
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/filters.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
@@ -43,13 +44,10 @@
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
-#include <types/filters.h>
-
 #include <haproxy/activity.h>
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/fd.h>
-#include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
 #include <proto/stream.h>