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

This one is particularly difficult to split because it provides all the
functions used to manipulate a proxy state and to retrieve names or IDs
for error reporting, and as such, it was included in 73 files (down to
68 after cleanup). It would deserve a small cleanup though the cut points
are not obvious at the moment given the number of structs involved in
the struct proxy itself.

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 41207ab477440936b8a637271a45b8ed88667ece..6e9e11631eed1e36070bcacb973e0a2947d28a15 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -29,7 +29,7 @@
 #include <proto/backend.h>
 #include <haproxy/compression.h>
 #include <haproxy/pipe.h>
-#include <proto/proxy.h>
+#include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <proto/server.h>
 #include <haproxy/ssl_sock.h>

diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h
index 9dd6363232c2aa1d8dc044b64ab9508f46dc0023..86bceb629a92c4f331daecd539e9a74fb1b927fc 100644 (file)
--- a/include/common/cfgparse.h
+++ b/include/common/cfgparse.h
@@ -25,7 +25,7 @@
 #include <haproxy/api.h>
 #include <haproxy/list-t.h>
 #include <haproxy/log.h>
-#include <proto/proxy.h>
+#include <haproxy/proxy.h>
 
 /* configuration sections */
 #define CFG_NONE       0

diff --git a/include/haproxy/acl-t.h b/include/haproxy/acl-t.h
index 3e3762c4ed410f392e32984d3b5427b4261e8db7..d2b0e3133659c56d87aa56b853fea319e944f522 100644 (file)
--- a/include/haproxy/acl-t.h
+++ b/include/haproxy/acl-t.h
@@ -24,11 +24,11 @@
 
 #include <import/ebmbtree.h>
 
+#include <haproxy/arg-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/api-t.h>
 
-#include <types/proxy.h>
 #include <types/server.h>
 
 

diff --git a/include/haproxy/applet-t.h b/include/haproxy/applet-t.h
index 4323905db3009f8a51370d1905a621664c0d87ff..7ce112a08a8a8367d64a5e261fe15bbabe32a229 100644 (file)
--- a/include/haproxy/applet-t.h
+++ b/include/haproxy/applet-t.h
@@ -27,10 +27,10 @@
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/obj_type-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/xref-t.h>
 
-#include <types/proxy.h>
 #include <types/stream.h>
 
 /* flags for appctx->state */

diff --git a/include/haproxy/check.h b/include/haproxy/check.h
index 85fc49b0d94ec1fc5628c1c690506d3b04c66581..f38ba2ad4295769e5cd1c8594194ffea61b5d3fd 100644 (file)
--- a/include/haproxy/check.h
+++ b/include/haproxy/check.h
@@ -26,7 +26,7 @@
 #include <haproxy/check-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/mailers.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/server.h>
 
 const char *get_check_status_description(short check_status);

diff --git a/include/haproxy/fcgi-app.h b/include/haproxy/fcgi-app.h
index becfdde9c3ed39bc7a53ab749a940a4f8d1e1c35..23f29f138f7112c01db10f40d0e2c641e89a88f0 100644 (file)
--- a/include/haproxy/fcgi-app.h
+++ b/include/haproxy/fcgi-app.h
@@ -23,7 +23,7 @@
 #define _HAPROXY_HTTP_FCGI_H
 
 #include <haproxy/fcgi-app-t.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/stream.h>
 
 struct fcgi_app *fcgi_app_find_by_name(const char *name);

diff --git a/include/haproxy/filters.h b/include/haproxy/filters.h
index b9f24bfc720c332e7e72a873456782cd31b80890..74b4ce968a722785ac1f9622f3afa068625c4a96 100644 (file)
--- a/include/haproxy/filters.h
+++ b/include/haproxy/filters.h
@@ -24,7 +24,7 @@
 #include <haproxy/channel.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/http_ana-t.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/stream.h>
 
 extern const char *trace_flt_id;

diff --git a/include/haproxy/flt_http_comp.h b/include/haproxy/flt_http_comp.h
index 4ba5ebbd04a5cef6eedcf5972c55400cb7e0329c..56f984a80106e9ee9804f683fef507358d61f674 100644 (file)
--- a/include/haproxy/flt_http_comp.h
+++ b/include/haproxy/flt_http_comp.h
@@ -21,7 +21,7 @@
 #ifndef _HAPROXY_FLT_HTTP_COMP_H
 #define _HAPROXY_FLT_HTTP_COMP_H
 
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 
 int check_implicit_http_comp_flt(struct proxy *proxy);
 

diff --git a/include/haproxy/global.h b/include/haproxy/global.h
index a3f952cb31c8713cabcefb64423e550f5c115dbf..5cfe0b9ad2618809a05dc5a665b936d055be8414 100644 (file)
--- a/include/haproxy/global.h
+++ b/include/haproxy/global.h
@@ -28,7 +28,7 @@
 #include <haproxy/vars-t.h>
 #include <haproxy/mworker-t.h>
 
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 
 extern struct global global;
 extern int  pid;                /* current process id */

diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index f363326a817a0ab20275c91cd56aaf409cd3ca89..35a7a8178c432b8ba5e391cec850aa5050838644 100644 (file)
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -30,10 +30,10 @@
 #include <import/ebpttree.h>
 
 #include <haproxy/list-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/regex-t.h>
 #include <haproxy/xref-t.h>
 
-#include <types/proxy.h>
 #include <types/server.h>
 #include <haproxy/stick_table-t.h>
 

diff --git a/include/haproxy/http_htx.h b/include/haproxy/http_htx.h
index 775037be08fe0cc16197366265736bcd80e0de9e..4b0f09744edd42a2a77f5107e5926815741bcd8c 100644 (file)
--- a/include/haproxy/http_htx.h
+++ b/include/haproxy/http_htx.h
@@ -26,8 +26,8 @@
 #include <import/ist.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/http_htx-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/regex-t.h>
-#include <types/proxy.h>
 
 extern struct buffer http_err_chunks[HTTP_ERR_SIZE];
 extern struct http_reply http_err_replies[HTTP_ERR_SIZE];

diff --git a/include/haproxy/http_rules.h b/include/haproxy/http_rules.h
index cc480f8bd3358b2027ab5dee8f7de324ff380e72..2006742cfa5314182cf37678481df1d0f6121138 100644 (file)
--- a/include/haproxy/http_rules.h
+++ b/include/haproxy/http_rules.h
@@ -25,7 +25,7 @@
 #include <haproxy/api.h>
 #include <haproxy/list.h>
 #include <haproxy/action-t.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 
 extern struct action_kw_list http_req_keywords;
 extern struct action_kw_list http_res_keywords;

diff --git a/include/haproxy/lb_fas.h b/include/haproxy/lb_fas.h
index 3293db8be347b2d0682e4996526a515596f2c9d7..fa2a5070c64f43e51dfc6c4525bb51043b64de11 100644 (file)
--- a/include/haproxy/lb_fas.h
+++ b/include/haproxy/lb_fas.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/lb_fas-t.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/server.h>
 
 struct server *fas_get_next_server(struct proxy *p, struct server *srvtoavoid);

diff --git a/include/haproxy/lb_fwlc.h b/include/haproxy/lb_fwlc.h
index 5a549e376050715534522291ae83f1d86aca022b..24c7d74aca5d4e05f0a8730f1ee061debfd656a9 100644 (file)
--- a/include/haproxy/lb_fwlc.h
+++ b/include/haproxy/lb_fwlc.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/lb_fwlc-t.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/server.h>
 
 struct server *fwlc_get_next_server(struct proxy *p, struct server *srvtoavoid);

diff --git a/include/haproxy/lb_fwrr.h b/include/haproxy/lb_fwrr.h
index af389966e517387b851c0cba4879172fca77ed56..0accf0615c32e847308bdb12cf76feceb78b912e 100644 (file)
--- a/include/haproxy/lb_fwrr.h
+++ b/include/haproxy/lb_fwrr.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/lb_fwrr-t.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/server.h>
 
 void fwrr_init_server_groups(struct proxy *p);

diff --git a/include/haproxy/lb_map.h b/include/haproxy/lb_map.h
index 2ab7158c24b7d72b4ec89831facf6b28b6a3df7f..1e390f729fbe0b68173e2cd1ac63963066687cc5 100644 (file)
--- a/include/haproxy/lb_map.h
+++ b/include/haproxy/lb_map.h
@@ -23,7 +23,7 @@
 #define _HAPROXY_LB_MAP_H
 
 #include <haproxy/api.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/server.h>
 
 void recalc_server_map(struct proxy *px);

diff --git a/include/haproxy/log.h b/include/haproxy/log.h
index caddd95b87b381a5c1c9ea6d903175f82e213a3b..1092920e9356ef812a9dfb1da0aaac9f519e199d 100644 (file)
--- a/include/haproxy/log.h
+++ b/include/haproxy/log.h
@@ -27,9 +27,9 @@
 #include <haproxy/api.h>
 #include <haproxy/log-t.h>
 #include <haproxy/pool-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/thread-t.h>
 #include <proto/stream.h>
-#include <types/proxy.h>
 
 extern struct pool_head *pool_head_requri;
 extern struct pool_head *pool_head_uniqueid;

diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index f59cf0a9326bf1eadb2313fd325e1ef201185780..0f932dd056615af56d8b6eefbe249bb73c526f68 100644 (file)
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -29,7 +29,7 @@
 #include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 #include <types/server.h>
 #include <types/stream.h>
 #include <haproxy/stream_interface-t.h>

diff --git a/include/haproxy/peers.h b/include/haproxy/peers.h
index c07ee6d3359f55e6c1a46666bd571de4c694402a..958123a3c525477d215ded083b00a9b746513a0b 100644 (file)
--- a/include/haproxy/peers.h
+++ b/include/haproxy/peers.h
@@ -26,9 +26,9 @@
 #include <haproxy/connection.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/peers-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/time.h>
 
-#include <types/proxy.h>
 #include <haproxy/stick_table-t.h>
 #include <types/stream.h>
 

diff --git a/include/types/proxy.h b/include/haproxy/proxy-t.h
similarity index 98%
rename from include/types/proxy.h
rename to include/haproxy/proxy-t.h
index 6bcad167c005006ae464e345169adb7f85563330..d66ab34488e8e32a04b6b23ca1e4beaa6ebc0144 100644 (file)
--- a/include/types/proxy.h
+++ b/include/haproxy/proxy-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/proxy.h
+ * include/haproxy/proxy-t.h
  * This file defines everything related to proxies.
  *
  * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
@@ -19,33 +19,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_PROXY_H
-#define _TYPES_PROXY_H
+#ifndef _HAPROXY_PROXY_T_H
+#define _HAPROXY_PROXY_T_H
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <import/eb32tree.h>
+#include <import/ebpttree.h>
+
 #include <haproxy/arg-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/check-t.h>
-#include <haproxy/chunk.h>
 #include <haproxy/counters-t.h>
-#include <haproxy/http-t.h>
+#include <haproxy/freq_ctr-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/thread.h>
-
-#include <import/eb32tree.h>
-#include <import/ebistree.h>
-
-#include <haproxy/acl-t.h>
+#include <haproxy/thread-t.h>
+#include <haproxy/api-t.h>
 #include <types/backend.h>
-#include <haproxy/freq_ctr-t.h>
-#include <haproxy/sample-t.h>
 #include <types/server.h>
-#include <haproxy/stick_table-t.h>
 
 /* values for proxy->state */
 enum pr_state {
@@ -532,7 +526,7 @@ struct cfg_opt {
        unsigned int mode;
 };
 
-#endif /* _TYPES_PROXY_H */
+#endif /* _HAPROXY_PROXY_T_H */
 
 /*
  * Local variables:

diff --git a/include/proto/proxy.h b/include/haproxy/proxy.h
similarity index 97%
rename from include/proto/proxy.h
rename to include/haproxy/proxy.h
index f5f0bf362291625fa776c8c41984e86599b27b24..0cfea6a63adfd8b48e7ef54a9497cb7b8488dcbd 100644 (file)
--- a/include/proto/proxy.h
+++ b/include/haproxy/proxy.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/proxy.h
+ * include/haproxy/proxy.h
  * This file defines function prototypes for proxy management.
  *
  * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
@@ -19,17 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_PROXY_H
-#define _PROTO_PROXY_H
+#ifndef _HAPROXY_PROXY_H
+#define _HAPROXY_PROXY_H
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/listener-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
-#include <haproxy/global-t.h>
-#include <types/proxy.h>
-#include <haproxy/freq_ctr.h>
+#include <types/server.h>
 
 extern struct proxy *proxies_list;
 extern struct eb_root used_proxy_id;   /* list of proxy IDs in use */
@@ -191,7 +191,7 @@ static inline int in_proxies_list(struct proxy *list, struct proxy *proxy)
        return 0;
 }
 
-#endif /* _PROTO_PROXY_H */
+#endif /* _HAPROXY_PROXY_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/ssl_sock.h b/include/haproxy/ssl_sock.h
index 1c4acd9444c7bac2187879ffa1d7465808ae2ada..f15b1cebda67438a32c4ca0feddfc1fda7a3288c 100644 (file)
--- a/include/haproxy/ssl_sock.h
+++ b/include/haproxy/ssl_sock.h
@@ -28,10 +28,9 @@
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ssl_sock-t.h>
 #include <haproxy/pool-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/thread.h>
 
-#include <types/proxy.h>
-
 extern struct list tlskeys_reference;
 extern int sslconns;
 extern int totalsslconns;

diff --git a/include/proto/backend.h b/include/proto/backend.h
index f702be9c20aeaf1e4eddbdf5fe642ec5364717e0..57d606e66126c1e6fab2bc02fdb171101cb48e5e 100644 (file)
--- a/include/proto/backend.h
+++ b/include/proto/backend.h
@@ -23,10 +23,10 @@
 #define _PROTO_BACKEND_H
 
 #include <haproxy/api.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/time.h>
 
 #include <types/backend.h>
-#include <types/proxy.h>
 #include <types/server.h>
 #include <types/stream.h>
 

diff --git a/include/proto/queue.h b/include/proto/queue.h
index 4397d601fc8e603a1595e3c178370397564ffbd7..735a1f147b5193ae9daf5b4212b81d6c44196280 100644 (file)
--- a/include/proto/queue.h
+++ b/include/proto/queue.h
@@ -24,8 +24,8 @@
 
 #include <haproxy/api.h>
 #include <haproxy/pool.h>
+#include <haproxy/proxy-t.h>
 
-#include <types/proxy.h>
 #include <types/queue.h>
 #include <types/stream.h>
 #include <types/server.h>

diff --git a/include/proto/server.h b/include/proto/server.h
index 34314236fce85b191ccde2d03185f69a3afb5da7..383e832c41281390d91f07903cf0fe378db96e53 100644 (file)
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -27,9 +27,9 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
 #include <haproxy/dns-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/task.h>
 #include <haproxy/time.h>
-#include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
 

diff --git a/include/types/spoe.h b/include/types/spoe.h
index 1f0a84aaf691440f9ec9669f457a5eb20098254e..f3edf862ddd7394bd496f1e909e2d6befc12ca7c 100644 (file)
--- a/include/types/spoe.h
+++ b/include/types/spoe.h
@@ -27,10 +27,10 @@
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/thread.h>
 
 #include <haproxy/freq_ctr-t.h>
-#include <types/proxy.h>
 #include <haproxy/sample-t.h>
 #include <types/stream.h>
 #include <haproxy/task-t.h>

diff --git a/include/types/stream.h b/include/types/stream.h
index 41b800cf34415b89118deec9fce4d66a5a5b2062..8f87ad58d572eacc90658bedbade64d324cb6d95 100644 (file)
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -36,11 +36,11 @@
 #include <haproxy/http_ana-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/vars-t.h>
 
-#include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
 #include <haproxy/task-t.h>

diff --git a/src/acl.c b/src/acl.c
index f3332ac2715e4ddca7ab82bbfb9b706c8b9655ee..77440edbedfd87e33d3429c28f1ceda32dc1de61 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -20,12 +20,12 @@
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/pattern.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/global.h>
 
 #include <haproxy/arg.h>
-#include <proto/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stick_table.h>
 

diff --git a/src/action.c b/src/action.c
index 999790356fca5f98123778e390ce81cc74c01915..d715379baf445e4378cc32b073d0ba2560bf6cce 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -16,10 +16,10 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 
-#include <proto/proxy.h>
 #include <haproxy/stick_table.h>
 
 

diff --git a/src/backend.c b/src/backend.c
index 423163f26a561e761ba113a84bd4acc7ff13b40b..18a56976346aad975f07333bc647b677def84730 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -37,6 +37,7 @@
 #include <haproxy/log.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/payload.h>
+#include <haproxy/proxy.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream_interface.h>
@@ -51,7 +52,6 @@
 #include <proto/backend.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/proxy.h>
 #include <proto/queue.h>
 #include <haproxy/sample.h>
 #include <proto/server.h>

diff --git a/src/cache.c b/src/cache.c
index 0858a8de8ea791a20150a61e651474653dde39a6..e95493ab203ba75b369df251ad38177fa561cd42 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -19,14 +19,12 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy.h>
 #include <haproxy/shctx.h>
 #include <haproxy/stream_interface.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
-#include <types/proxy.h>
-
-#include <proto/proxy.h>
 #include <proto/stream.h>
 
 

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 9ec25a3c5e4df0a711660e191c4b830a0dcd959a..425b57c36b78dfc91ad751ea5d87b9a90494218f 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -23,11 +23,11 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/listener.h>
 #include <haproxy/peers.h>
+#include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
 
 #include <haproxy/protocol.h>
-#include <proto/proxy.h>
 #include <proto/server.h>
 #include <haproxy/stick_table.h>
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index a15028b2e2366080ce5ac7420440ffde0b0820bd..0be9834ad7dc755e36240fc9eddd147ac800bab8 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -60,6 +60,7 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers-t.h>
 #include <haproxy/pool.h>
+#include <haproxy/proxy.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/tools.h>
@@ -73,7 +74,6 @@
 
 #include <proto/backend.h>
 #include <haproxy/protocol.h>
-#include <proto/proxy.h>
 #include <haproxy/peers.h>
 #include <haproxy/sample.h>
 #include <proto/server.h>

diff --git a/src/check.c b/src/check.c
index 6b4f9faecf198b9d075bf7f4d97fb15d05c17084..d3283509481bdcd1b4cc11e1b48687fbf1baffbe 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -47,6 +47,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/htx.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy.h>
 #include <haproxy/signal.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
@@ -63,7 +64,6 @@
 #include <haproxy/port_range.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/protocol.h>
-#include <proto/proxy.h>
 #include <proto/server.h>
 #include <haproxy/proto_udp.h>
 #include <haproxy/sample.h>

diff --git a/src/cli.c b/src/cli.c
index e5413e9f00c3c8ba678974ea26c3ccc204b8f205..dd4ef0d2580a2cbd61fd8ed79ea7f6ac42352a52 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -40,6 +40,7 @@
 #include <haproxy/mworker-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/peers.h>
+#include <haproxy/proxy.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
@@ -60,7 +61,6 @@
 #include <haproxy/freq_ctr.h>
 #include <haproxy/pipe.h>
 #include <haproxy/protocol.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 #include <proto/server.h>
 

diff --git a/src/dns.c b/src/dns.c
index bcbc435aef3d785c0658f5fd8fc878e657fe6a24..dd29d270dc62a91629c114bc91fdf6a8caf6a9fa 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -29,6 +29,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
@@ -44,7 +45,6 @@
 #include <haproxy/fd.h>
 #include <proto/server.h>
 #include <haproxy/proto_udp.h>
-#include <proto/proxy.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/fcgi-app.c b/src/fcgi-app.c
index d7183c5fd6a04eca1e818c162bc8c2cc8ced2ed2..5d7aeffc0fb5e8835cad52401d08adde2b5ec5c7 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -20,6 +20,7 @@
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
@@ -27,7 +28,6 @@
 
 #include <haproxy/global.h>
 
-#include <proto/proxy.h>
 #include <proto/server.h>
 
 /* Global list of all FCGI applications */

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 1b8fffb5979f7cddc40dd06ac6941bb4db825716..db758d1ee975d62c2e77da0647759fb21f59f215 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -20,11 +20,10 @@
 #include <common/cfgparse.h>
 #include <haproxy/htx.h>
 #include <haproxy/list.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 
-#include <types/proxy.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 f5094c02ffb12046cd8302e31d420a0db4d051e2..ec393b20ab3922f195d807dc2874c519054ae49b 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -24,6 +24,7 @@
 #include <haproxy/signal.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
+#include <haproxy/proxy.h>
 #include <haproxy/session.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
@@ -38,7 +39,6 @@
 #include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/proxy.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>
 

diff --git a/src/flt_trace.c b/src/flt_trace.c
index 01278bb0bac9a9f8d49dc021639fc4756eb94d15..940ddd2e29f97bedd79e4c782a962505f0de41e0 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -19,11 +19,11 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
 #include <haproxy/global.h>
-#include <types/proxy.h>
 #include <types/stream.h>
 
 #include <proto/stream.h>

diff --git a/src/frontend.c b/src/frontend.c
index 8252c81be1690ddf5364e0437c4ae17ce60edb5b..78dc964ed2706d58773a2e5fd0a4580476420394 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -28,6 +28,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
@@ -39,7 +40,6 @@
 #include <haproxy/arg.h>
 #include <haproxy/fd.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 
 /* Finish a stream accept() for a proxy (TCP or HTTP). It returns a negative

diff --git a/src/haproxy.c b/src/haproxy.c
index 9e2f94a2cb9a5fca23c871e42ed52fdf15ae12e1..b617249a961c098497196d3b12917b9f02c58885 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -104,6 +104,7 @@
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern.h>
 #include <haproxy/peers.h>
+#include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/regex.h>
 #include <haproxy/session.h>
@@ -125,7 +126,6 @@
 #include <proto/backend.h>
 #include <haproxy/fd.h>
 #include <haproxy/protocol.h>
-#include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/stream.h>

diff --git a/src/hlua.c b/src/hlua.c
index afff59a02ea30c0af8ad0a8980e725592efb0edd..d557777c90d59b7b648c6e3ce751086bca3859df 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -43,6 +43,7 @@
 #include <haproxy/obj_type.h>
 #include <haproxy/pattern.h>
 #include <haproxy/payload.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
@@ -52,8 +53,6 @@
 #include <haproxy/tools.h>
 #include <haproxy/vars.h>
 
-#include <types/proxy.h>
-
 #include <haproxy/arg.h>
 #include <proto/queue.h>
 #include <proto/server.h>

diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index 12bca02c3a0bfd19290d182856523f6f0afa1d48..34577b5f5063f4945f6d544cbdd7bf890aa73b00 100644 (file)
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -23,13 +23,12 @@
 #include <haproxy/http.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/pattern-t.h>
+#include <haproxy/proxy.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats.h>
 #include <haproxy/time.h>
 
-#include <types/proxy.h>
-
-#include <proto/proxy.h>
 #include <proto/server.h>
 #include <haproxy/stick_table.h>
 

diff --git a/src/http_ana.c b/src/http_ana.c
index 373e399a77b67b6420c461f5f24952a7a34e3750..c420d796ac65377652936f0e991d453d74728ba5 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -24,6 +24,7 @@
 #include <haproxy/htx.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/proxy.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream_interface.h>
@@ -32,7 +33,6 @@
 
 #include <haproxy/capture-t.h>
 
-#include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stream.h>
 

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index e13ce55b5d2e5248a1d1878a9ccc7b55a94fe2d4..5664b8814d27a1fa331e7a70ed81b60a7e38435e 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -23,13 +23,12 @@
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/proxy-t.h>
 #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/stream.h>
 #include <haproxy/trace.h>
 

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 75a640847ac19c0e0f95998f28970ec53b129f20..c2896b48f9a2561be614f1ed92daae6766f818c5 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -21,7 +21,7 @@
 #include <import/ebistree.h>
 
 #include <haproxy/pipe-t.h>
-#include <types/proxy.h>
+#include <haproxy/proxy-t.h>
 
 #include <haproxy/http_htx.h>
 #include <haproxy/log.h>

diff --git a/src/mworker.c b/src/mworker.c
index d891f2fda30ac6f9fe304174358c0785fb02353d..9546b26e815addbf76096fd060022671d7b2b322 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -25,6 +25,7 @@
 #include <haproxy/log.h>
 #include <haproxy/mworker.h>
 #include <haproxy/peers.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/version.h>
@@ -32,7 +33,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 
 

diff --git a/src/peers.c b/src/peers.c
index 633f9aeb720b0e1e76f1c16311fa26bc13c14777..933f8ba75ee32b56e703b8e6fc5ee6cdcbe298aa 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -30,6 +30,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
+#include <haproxy/proxy.h>
 #include <haproxy/task.h>
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
@@ -40,7 +41,6 @@
 #include <haproxy/thread.h>
 
 #include <haproxy/fd.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 #include <haproxy/stick_table.h>
 

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 63624f600b08537435a8d1cf5f3120f99b28ea5a..c2a1869e59fe9e421ce220ae4c4e77d1067691d5 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -40,6 +40,7 @@
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/namespace.h>
@@ -51,7 +52,6 @@
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/proxy.h>
 #include <proto/server.h>
 #include <haproxy/tcp_rules.h>
 

diff --git a/src/proxy.c b/src/proxy.c
index 6a0a158a4a9200f7398b6e207356036fcc5c3317..1ca6ab276a2ade7510ee4805cb16af22536cdf73 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -30,6 +30,7 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/pool.h>
+#include <haproxy/proxy.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
@@ -43,7 +44,6 @@
 #include <proto/backend.h>
 #include <haproxy/fd.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/proxy.h>
 #include <proto/server.h>
 #include <haproxy/signal.h>
 #include <proto/stream.h>

diff --git a/src/sample.c b/src/sample.c
index 99b6fd548f91732dd2e61dd9e2c10a5ac3c9b21e..f7ecb656462334e7304c5e95e5279aff83f6ffeb 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -27,6 +27,7 @@
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/protobuf.h>
+#include <haproxy/proxy.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
@@ -35,7 +36,6 @@
 #include <haproxy/base64.h>
 
 #include <haproxy/arg.h>
-#include <proto/proxy.h>
 #include <haproxy/sink.h>
 #include <haproxy/stick_table.h>
 

diff --git a/src/session.c b/src/session.c
index 4169870f9dfc074d276ac2a50582c8880269cbfd..7066a8f7d7471be0274e1c1b5114525f9718af9c 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -17,11 +17,11 @@
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/pool.h>
+#include <haproxy/proxy.h>
 #include <haproxy/session.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
-#include <proto/proxy.h>
 #include <proto/stream.h>
 
 DECLARE_POOL(pool_head_session, "session", sizeof(struct session));

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 1b1b0e47d7f9ffce7568282be7805f02b5f2f308..3a0918f9a1e2916debd8d095b9cfd4d7eb5c5f07 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -56,6 +56,7 @@
 #include <haproxy/log.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern-t.h>
+#include <haproxy/proxy.h>
 #include <haproxy/shctx.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
@@ -78,7 +79,6 @@
 #include <haproxy/freq_ctr.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/server.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 
 /* ***** READ THIS before adding code here! *****

diff --git a/src/stats.c b/src/stats.c
index 40ea9c8bea861901ba1eeb74ff3afec412478ade..477b0ab87c17922346062f9e77b74d995f457b6b 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -44,6 +44,7 @@
 #include <haproxy/log.h>
 #include <haproxy/map-t.h>
 #include <haproxy/pattern-t.h>
+#include <haproxy/proxy.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats.h>
@@ -60,7 +61,6 @@
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/pipe.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 #include <proto/server.h>
 

diff --git a/src/stick_table.c b/src/stick_table.c
index fdf1b585ad04794e0e5159fdd636cd958e56671c..03f6ca4e9b2aeaa7dd7191fc0f0d46a756141175 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -24,6 +24,7 @@
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/peers.h>
+#include <haproxy/proxy.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
@@ -33,10 +34,10 @@
 
 #include <import/ebmbtree.h>
 #include <import/ebsttree.h>
+#include <import/ebistree.h>
 
 #include <haproxy/arg.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/proxy.h>
 #include <haproxy/sample.h>
 #include <proto/stream.h>
 #include <haproxy/stick_table.h>

diff --git a/src/stream.c b/src/stream.c
index eab3356acbdc1b8cd5444df787669b80bfd8d05f..4bf1bdc7d15a725cfbe61209cd1f20e21fcf934b 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -14,6 +14,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <import/ebistree.h>
+
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
 #include <haproxy/applet.h>
@@ -38,6 +40,7 @@
 #include <haproxy/htx.h>
 #include <haproxy/log.h>
 #include <haproxy/pool.h>
+#include <haproxy/proxy.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
@@ -52,7 +55,6 @@
 #include <haproxy/freq_ctr.h>
 #include <proto/stream.h>
 #include <haproxy/pipe.h>
-#include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <haproxy/stick_table.h>

diff --git a/src/stream_interface.c b/src/stream_interface.c
index 6b6b76d6c52c58543f40e39294996a7801bd59a0..67477a54cdc6bf332dda9cf8478dec1bec17ac9d 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -25,6 +25,7 @@
 #include <haproxy/connection.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/proxy.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -32,7 +33,6 @@
 #include <haproxy/task.h>
 
 #include <haproxy/pipe.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 
 #include <haproxy/pipe-t.h>

diff --git a/src/task.c b/src/task.c
index f055ebb2b10697b75cd22636ffa8a64408c0a370..368c3d059c309b4d566acc2dc29e9876963ab801 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -23,7 +23,6 @@
 
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/proxy.h>
 #include <proto/stream.h>
 
 DECLARE_POOL(pool_head_task,    "task",    sizeof(struct task));

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index a02e25f04e54f694212fb0ee1918cdd5565ee521..750108bfd30b5d27094d3696c3e09286f0533bf3 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -19,6 +19,7 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
+#include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tcp_rules.h>
@@ -28,7 +29,6 @@
 
 #include <haproxy/arg-t.h>
 
-#include <proto/proxy.h>
 #include <haproxy/stick_table.h>
 #include <proto/stream.h>