From a264d960f687140f833a02358f3c362cb4587c20 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 4 Jun 2020 22:29:18 +0200 Subject: [PATCH] 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. --- .../prometheus-exporter/service-prometheus.c | 2 +- include/common/cfgparse.h | 2 +- include/haproxy/acl-t.h | 2 +- include/haproxy/applet-t.h | 2 +- include/haproxy/check.h | 2 +- include/haproxy/fcgi-app.h | 2 +- include/haproxy/filters.h | 2 +- include/haproxy/flt_http_comp.h | 2 +- include/haproxy/global.h | 2 +- include/haproxy/hlua-t.h | 2 +- include/haproxy/http_htx.h | 2 +- include/haproxy/http_rules.h | 2 +- include/haproxy/lb_fas.h | 2 +- include/haproxy/lb_fwlc.h | 2 +- include/haproxy/lb_fwrr.h | 2 +- include/haproxy/lb_map.h | 2 +- include/haproxy/log.h | 2 +- include/haproxy/obj_type.h | 2 +- include/haproxy/peers.h | 2 +- include/{types/proxy.h => haproxy/proxy-t.h} | 26 +++++++------------ include/{proto => haproxy}/proxy.h | 14 +++++----- include/haproxy/ssl_sock.h | 3 +-- include/proto/backend.h | 2 +- include/proto/queue.h | 2 +- include/proto/server.h | 2 +- include/types/spoe.h | 2 +- include/types/stream.h | 2 +- src/acl.c | 2 +- src/action.c | 2 +- src/backend.c | 2 +- src/cache.c | 4 +-- src/cfgparse-listen.c | 2 +- src/cfgparse.c | 2 +- src/check.c | 2 +- src/cli.c | 2 +- src/dns.c | 2 +- src/fcgi-app.c | 2 +- src/flt_http_comp.c | 3 +-- src/flt_spoe.c | 2 +- src/flt_trace.c | 2 +- src/frontend.c | 2 +- src/haproxy.c | 2 +- src/hlua.c | 3 +-- src/hlua_fcn.c | 5 ++-- src/http_ana.c | 2 +- src/mux_fcgi.c | 3 +-- src/mux_h1.c | 2 +- src/mworker.c | 2 +- src/peers.c | 2 +- src/proto_tcp.c | 2 +- src/proxy.c | 2 +- src/sample.c | 2 +- src/session.c | 2 +- src/ssl_sock.c | 2 +- src/stats.c | 2 +- src/stick_table.c | 3 ++- src/stream.c | 4 ++- src/stream_interface.c | 2 +- src/task.c | 1 - src/tcp_rules.c | 2 +- 60 files changed, 78 insertions(+), 89 deletions(-) rename include/{types/proxy.h => haproxy/proxy-t.h} (98%) rename include/{proto => haproxy}/proxy.h (97%) diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c index 41207ab47..6e9e11631 100644 --- a/contrib/prometheus-exporter/service-prometheus.c +++ b/contrib/prometheus-exporter/service-prometheus.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h index 9dd636323..86bceb629 100644 --- a/include/common/cfgparse.h +++ b/include/common/cfgparse.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include /* configuration sections */ #define CFG_NONE 0 diff --git a/include/haproxy/acl-t.h b/include/haproxy/acl-t.h index 3e3762c4e..d2b0e3133 100644 --- a/include/haproxy/acl-t.h +++ b/include/haproxy/acl-t.h @@ -24,11 +24,11 @@ #include +#include #include #include #include -#include #include diff --git a/include/haproxy/applet-t.h b/include/haproxy/applet-t.h index 4323905db..7ce112a08 100644 --- a/include/haproxy/applet-t.h +++ b/include/haproxy/applet-t.h @@ -27,10 +27,10 @@ #include #include #include +#include #include #include -#include #include /* flags for appctx->state */ diff --git a/include/haproxy/check.h b/include/haproxy/check.h index 85fc49b0d..f38ba2ad4 100644 --- a/include/haproxy/check.h +++ b/include/haproxy/check.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include const char *get_check_status_description(short check_status); diff --git a/include/haproxy/fcgi-app.h b/include/haproxy/fcgi-app.h index becfdde9c..23f29f138 100644 --- a/include/haproxy/fcgi-app.h +++ b/include/haproxy/fcgi-app.h @@ -23,7 +23,7 @@ #define _HAPROXY_HTTP_FCGI_H #include -#include +#include #include struct fcgi_app *fcgi_app_find_by_name(const char *name); diff --git a/include/haproxy/filters.h b/include/haproxy/filters.h index b9f24bfc7..74b4ce968 100644 --- a/include/haproxy/filters.h +++ b/include/haproxy/filters.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include extern const char *trace_flt_id; diff --git a/include/haproxy/flt_http_comp.h b/include/haproxy/flt_http_comp.h index 4ba5ebbd0..56f984a80 100644 --- 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 +#include int check_implicit_http_comp_flt(struct proxy *proxy); diff --git a/include/haproxy/global.h b/include/haproxy/global.h index a3f952cb3..5cfe0b9ad 100644 --- a/include/haproxy/global.h +++ b/include/haproxy/global.h @@ -28,7 +28,7 @@ #include #include -#include +#include 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 f363326a8..35a7a8178 100644 --- a/include/haproxy/hlua-t.h +++ b/include/haproxy/hlua-t.h @@ -30,10 +30,10 @@ #include #include +#include #include #include -#include #include #include diff --git a/include/haproxy/http_htx.h b/include/haproxy/http_htx.h index 775037be0..4b0f09744 100644 --- a/include/haproxy/http_htx.h +++ b/include/haproxy/http_htx.h @@ -26,8 +26,8 @@ #include #include #include +#include #include -#include 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 cc480f8bd..2006742cf 100644 --- a/include/haproxy/http_rules.h +++ b/include/haproxy/http_rules.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include 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 3293db8be..fa2a5070c 100644 --- a/include/haproxy/lb_fas.h +++ b/include/haproxy/lb_fas.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include 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 5a549e376..24c7d74ac 100644 --- a/include/haproxy/lb_fwlc.h +++ b/include/haproxy/lb_fwlc.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include 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 af389966e..0accf0615 100644 --- a/include/haproxy/lb_fwrr.h +++ b/include/haproxy/lb_fwrr.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include void fwrr_init_server_groups(struct proxy *p); diff --git a/include/haproxy/lb_map.h b/include/haproxy/lb_map.h index 2ab7158c2..1e390f729 100644 --- a/include/haproxy/lb_map.h +++ b/include/haproxy/lb_map.h @@ -23,7 +23,7 @@ #define _HAPROXY_LB_MAP_H #include -#include +#include #include void recalc_server_map(struct proxy *px); diff --git a/include/haproxy/log.h b/include/haproxy/log.h index caddd95b8..1092920e9 100644 --- a/include/haproxy/log.h +++ b/include/haproxy/log.h @@ -27,9 +27,9 @@ #include #include #include +#include #include #include -#include 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 f59cf0a93..0f932dd05 100644 --- a/include/haproxy/obj_type.h +++ b/include/haproxy/obj_type.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/haproxy/peers.h b/include/haproxy/peers.h index c07ee6d33..958123a3c 100644 --- a/include/haproxy/peers.h +++ b/include/haproxy/peers.h @@ -26,9 +26,9 @@ #include #include #include +#include #include -#include #include #include 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 6bcad167c..d66ab3448 100644 --- 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 #include #include #include +#include +#include + #include -#include #include -#include #include -#include +#include #include #include -#include - -#include -#include - -#include +#include +#include #include -#include -#include #include -#include /* 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 f5f0bf362..0cfea6a63 100644 --- 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 #include +#include #include +#include #include #include -#include -#include -#include +#include 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 1c4acd944..f15b1cebd 100644 --- a/include/haproxy/ssl_sock.h +++ b/include/haproxy/ssl_sock.h @@ -28,10 +28,9 @@ #include #include #include +#include #include -#include - extern struct list tlskeys_reference; extern int sslconns; extern int totalsslconns; diff --git a/include/proto/backend.h b/include/proto/backend.h index f702be9c2..57d606e66 100644 --- a/include/proto/backend.h +++ b/include/proto/backend.h @@ -23,10 +23,10 @@ #define _PROTO_BACKEND_H #include +#include #include #include -#include #include #include diff --git a/include/proto/queue.h b/include/proto/queue.h index 4397d601f..735a1f147 100644 --- a/include/proto/queue.h +++ b/include/proto/queue.h @@ -24,8 +24,8 @@ #include #include +#include -#include #include #include #include diff --git a/include/proto/server.h b/include/proto/server.h index 34314236f..383e832c4 100644 --- a/include/proto/server.h +++ b/include/proto/server.h @@ -27,9 +27,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/include/types/spoe.h b/include/types/spoe.h index 1f0a84aaf..f3edf862d 100644 --- a/include/types/spoe.h +++ b/include/types/spoe.h @@ -27,10 +27,10 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/include/types/stream.h b/include/types/stream.h index 41b800cf3..8f87ad58d 100644 --- a/include/types/stream.h +++ b/include/types/stream.h @@ -36,11 +36,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/src/acl.c b/src/acl.c index f3332ac27..77440edbe 100644 --- a/src/acl.c +++ b/src/acl.c @@ -20,12 +20,12 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/src/action.c b/src/action.c index 999790356..d715379ba 100644 --- a/src/action.c +++ b/src/action.c @@ -16,10 +16,10 @@ #include #include #include +#include #include #include -#include #include diff --git a/src/backend.c b/src/backend.c index 423163f26..18a569763 100644 --- a/src/backend.c +++ b/src/backend.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/src/cache.c b/src/cache.c index 0858a8de8..e95493ab2 100644 --- a/src/cache.c +++ b/src/cache.c @@ -19,14 +19,12 @@ #include #include #include +#include #include #include #include #include -#include - -#include #include diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 9ec25a3c5..425b57c36 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -23,11 +23,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/src/cfgparse.c b/src/cfgparse.c index a15028b2e..0be9834ad 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -73,7 +74,6 @@ #include #include -#include #include #include #include diff --git a/src/check.c b/src/check.c index 6b4f9faec..d32835094 100644 --- a/src/check.c +++ b/src/check.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -63,7 +64,6 @@ #include #include #include -#include #include #include #include diff --git a/src/cli.c b/src/cli.c index e5413e9f0..dd4ef0d25 100644 --- a/src/cli.c +++ b/src/cli.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #include #include -#include #include #include diff --git a/src/dns.c b/src/dns.c index bcbc435ae..dd29d270d 100644 --- a/src/dns.c +++ b/src/dns.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,6 @@ #include #include #include -#include 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 d7183c5fd..5d7aeffc0 100644 --- a/src/fcgi-app.c +++ b/src/fcgi-app.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -27,7 +28,6 @@ #include -#include #include /* Global list of all FCGI applications */ diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c index 1b8fffb59..db758d1ee 100644 --- a/src/flt_http_comp.c +++ b/src/flt_http_comp.c @@ -20,11 +20,10 @@ #include #include #include +#include #include #include -#include - #include const char *http_comp_flt_id = "compression filter"; diff --git a/src/flt_spoe.c b/src/flt_spoe.c index f5094c02f..ec393b20a 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -38,7 +39,6 @@ #include #include #include -#include #include #include diff --git a/src/flt_trace.c b/src/flt_trace.c index 01278bb0b..940ddd2e2 100644 --- a/src/flt_trace.c +++ b/src/flt_trace.c @@ -19,11 +19,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/src/frontend.c b/src/frontend.c index 8252c81be..78dc964ed 100644 --- a/src/frontend.c +++ b/src/frontend.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include /* 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 9e2f94a2c..b617249a9 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -104,6 +104,7 @@ #include #include #include +#include #include #include #include @@ -125,7 +126,6 @@ #include #include #include -#include #include #include #include diff --git a/src/hlua.c b/src/hlua.c index afff59a02..d557777c9 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -52,8 +53,6 @@ #include #include -#include - #include #include #include diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c index 12bca02c3..34577b5f5 100644 --- a/src/hlua_fcn.c +++ b/src/hlua_fcn.c @@ -23,13 +23,12 @@ #include #include #include +#include +#include #include #include #include -#include - -#include #include #include diff --git a/src/http_ana.c b/src/http_ana.c index 373e399a7..c420d796a 100644 --- a/src/http_ana.c +++ b/src/http_ana.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include -#include #include #include diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index e13ce55b5..5664b8814 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -23,13 +23,12 @@ #include #include #include +#include #include #include #include #include -#include - #include #include diff --git a/src/mux_h1.c b/src/mux_h1.c index 75a640847..c2896b48f 100644 --- a/src/mux_h1.c +++ b/src/mux_h1.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/mworker.c b/src/mworker.c index d891f2fda..9546b26e8 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include -#include #include diff --git a/src/peers.c b/src/peers.c index 633f9aeb7..933f8ba75 100644 --- a/src/peers.c +++ b/src/peers.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -40,7 +41,6 @@ #include #include -#include #include #include diff --git a/src/proto_tcp.c b/src/proto_tcp.c index 63624f600..c2a1869e5 100644 --- a/src/proto_tcp.c +++ b/src/proto_tcp.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #include #include diff --git a/src/proxy.c b/src/proxy.c index 6a0a158a4..1ca6ab276 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -43,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/src/sample.c b/src/sample.c index 99b6fd548..f7ecb6564 100644 --- a/src/sample.c +++ b/src/sample.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include #include -#include #include #include diff --git a/src/session.c b/src/session.c index 4169870f9..7066a8f7d 100644 --- a/src/session.c +++ b/src/session.c @@ -17,11 +17,11 @@ #include #include #include +#include #include #include #include -#include #include DECLARE_POOL(pool_head_session, "session", sizeof(struct session)); diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 1b1b0e47d..3a0918f9a 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -78,7 +79,6 @@ #include #include #include -#include #include /* ***** READ THIS before adding code here! ***** diff --git a/src/stats.c b/src/stats.c index 40ea9c8be..477b0ab87 100644 --- a/src/stats.c +++ b/src/stats.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #include #include -#include #include #include diff --git a/src/stick_table.c b/src/stick_table.c index fdf1b585a..03f6ca4e9 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -33,10 +34,10 @@ #include #include +#include #include #include -#include #include #include #include diff --git a/src/stream.c b/src/stream.c index eab3356ac..4bf1bdc7d 100644 --- a/src/stream.c +++ b/src/stream.c @@ -14,6 +14,8 @@ #include #include +#include + #include #include #include @@ -38,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -52,7 +55,6 @@ #include #include #include -#include #include #include #include diff --git a/src/stream_interface.c b/src/stream_interface.c index 6b6b76d6c..67477a54c 100644 --- a/src/stream_interface.c +++ b/src/stream_interface.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include -#include #include #include diff --git a/src/task.c b/src/task.c index f055ebb2b..368c3d059 100644 --- a/src/task.c +++ b/src/task.c @@ -23,7 +23,6 @@ #include #include -#include #include DECLARE_POOL(pool_head_task, "task", sizeof(struct task)); diff --git a/src/tcp_rules.c b/src/tcp_rules.c index a02e25f04..750108bfd 100644 --- a/src/tcp_rules.c +++ b/src/tcp_rules.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include -#include #include #include