REORG: include: split global.h into haproxy/global{,-t}.h

global.h was one of the messiest files, it has accumulated tons of
implicit dependencies and declares many globals that make almost all
other file include it. It managed to silence a dependency loop between
server.h and proxy.h by being well placed to pre-define the required
structs, forcing struct proxy and struct server to be forward-declared
in a significant number of files.

It was split in to, one which is the global struct definition and the
few macros and flags, and the rest containing the functions prototypes.

The UNIX_MAX_PATH definition was moved to compat.h.

diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index 8b9d998dda56e3a565197add74aaa21faf8410ec..9aec53888c078c8ad930c8a1f88906b1ac6931fc 100644 (file)
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -16,10 +16,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
 #include <types/stream.h>
 
 #include <haproxy/arg.h>

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index fa36aa7f051e9fce0cc9e48974ee72270ba30f3e..ed27bc49ea76e492efa4c43421818498e672953a 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -17,6 +17,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
@@ -24,8 +25,6 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 
-#include <types/global.h>
-
 #include <proto/applet.h>
 #include <proto/backend.h>
 #include <haproxy/compression.h>

diff --git a/include/haproxy/compat.h b/include/haproxy/compat.h
index 251dfb2020ebacff7ea12954cd6335fd9e53c0d8..fdd6fa4cd4e78c19464c81fadd384059e62324be 100644 (file)
--- a/include/haproxy/compat.h
+++ b/include/haproxy/compat.h
@@ -108,6 +108,11 @@ typedef struct { } empty_t;
 #define MAXPATHLEN 128
 #endif
 
+/* longest UNIX socket name */
+#ifndef UNIX_MAX_PATH
+#define UNIX_MAX_PATH 108
+#endif
+
 /* On Linux, allows pipes to be resized */
 #ifndef F_SETPIPE_SZ
 #define F_SETPIPE_SZ (1024 + 7)

diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index fe3938a8ca260b8dd95a8fa350f223cb530fe6ba..54c58ee6c629106238f3d8d130a715191060a465 100644 (file)
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@@ -30,8 +30,6 @@
 
 #include <types/connection.h>
 #include <haproxy/proto_udp-t.h>
-#include <types/proxy.h>
-#include <types/server.h>
 #include <types/task.h>
 
 extern struct pool_head *dns_requester_pool;
@@ -346,6 +344,7 @@ enum {
        DNS_UPD_OBSOLETE_IP,      /* The server IP was obsolete, and no other IP was found */
 };
 
+struct proxy;
 struct dns_srvrq {
        enum obj_type         obj_type;         /* object type == OBJ_TYPE_SRVRQ */
        struct dns_resolvers *resolvers;        /* pointer to the resolvers structure used for this server template */

diff --git a/include/types/global.h b/include/haproxy/global-t.h
similarity index 60%
rename from include/types/global.h
rename to include/haproxy/global-t.h
index 56e7678a1f05b477a078c56c9fc3f5491dfdccf2..bee8de7a982df6bbf0e2720bdf2e0b35cc8edb43 100644 (file)
--- a/include/types/global.h
+++ b/include/haproxy/global-t.h
@@ -1,8 +1,8 @@
 /*
- * include/types/global.h
- * Global variables.
+ * include/haproxy/global-t.h
+ * Global types and macros. Please avoid adding more stuff here!
  *
- * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,23 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_GLOBAL_H
-#define _TYPES_GLOBAL_H
-
-#include <netinet/in.h>
+#ifndef _HAPROXY_GLOBAL_T_H
+#define _HAPROXY_GLOBAL_T_H
 
+#include <haproxy/buf-t.h>
+#include <haproxy/freq_ctr-t.h>
+#include <haproxy/list-t.h>
+#include <haproxy/thread-t.h>
 #include <haproxy/api-t.h>
-#include <haproxy/thread.h>
 #include <haproxy/vars-t.h>
 
-#include <haproxy/freq_ctr-t.h>
-#include <types/proxy.h>
-#include <types/task.h>
-
-#ifndef UNIX_MAX_PATH
-#define UNIX_MAX_PATH 108
-#endif
-
 /* modes of operation (global.mode) */
 #define        MODE_DEBUG      0x01
 #define        MODE_DAEMON     0x02
@@ -82,6 +75,14 @@ enum {
        SSL_SERVER_VERIFY_REQUIRED = 1,
 };
 
+/* bit values to go with "warned" above */
+#define WARN_ANY                    0x00000001 /* any warning was emitted */
+#define WARN_FORCECLOSE_DEPRECATED  0x00000002
+#define WARN_EXEC_PATH              0x00000004 /* executable path already reported */
+
+/* put there the forward declarations needed for global.h */
+struct proxy;
+
 /* FIXME : this will have to be redefined correctly */
 struct global {
        int uid;
@@ -180,130 +181,7 @@ struct global {
 #endif
 };
 
-extern struct global global;
-extern int  pid;                /* current process id */
-extern int  relative_pid;       /* process id starting at 1 */
-extern unsigned long pid_bit;   /* bit corresponding to the process id */
-extern unsigned long all_proc_mask; /* mask of all processes */
-extern int  actconn;            /* # of active sessions */
-extern int  listeners;
-extern int  jobs;               /* # of active jobs (listeners, sessions, open devices) */
-extern int  unstoppable_jobs;   /* # of active jobs that can't be stopped during a soft stop */
-extern int  active_peers;       /* # of active peers (connection attempts and successes) */
-extern int  connected_peers;    /* # of really connected peers */
-extern THREAD_LOCAL struct buffer trash;
-extern int nb_oldpids;          /* contains the number of old pids found */
-extern const int zero;
-extern const int one;
-extern const struct linger nolinger;
-extern int stopping;   /* non zero means stopping in progress */
-extern int killed;     /* >0 means a hard-stop is triggered, >1 means hard-stop immediately */
-extern char hostname[MAX_HOSTNAME_LEN];
-extern char localpeer[MAX_HOSTNAME_LEN];
-extern unsigned int warned;     /* bitfield of a few warnings to emit just once */
-extern volatile unsigned long sleeping_thread_mask;
-extern struct list proc_list; /* list of process in mworker mode */
-extern struct mworker_proc *proc_self; /* process structure of current process */
-extern int master; /* 1 if in master, 0 otherwise */
-extern unsigned int rlim_fd_cur_at_boot;
-extern unsigned int rlim_fd_max_at_boot;
-extern int atexit_flag;
-extern unsigned char boot_seed[20];  // per-boot random seed (160 bits initially)
-
-/* bit values to go with "warned" above */
-#define WARN_ANY                    0x00000001 /* any warning was emitted */
-#define WARN_FORCECLOSE_DEPRECATED  0x00000002
-#define WARN_EXEC_PATH              0x00000004 /* executable path already reported */
-
-
-/* to be used with warned and WARN_* */
-static inline int already_warned(unsigned int warning)
-{
-       if (warned & warning)
-               return 1;
-       warned |= warning;
-       return 0;
-}
-
-/* returns a mask if set, otherwise all_proc_mask */
-static inline unsigned long proc_mask(unsigned long mask)
-{
-       return mask ? mask : all_proc_mask;
-}
-
-/* returns a mask if set, otherwise all_threads_mask */
-static inline unsigned long thread_mask(unsigned long mask)
-{
-       return mask ? mask : all_threads_mask;
-}
-
-int tell_old_pids(int sig);
-int delete_oldpid(int pid);
-
-int main(int argc, char **argv);
-void deinit(void);
-void run_poll_loop(void);
-void hap_register_build_opts(const char *str, int must_free);
-void hap_register_post_check(int (*fct)());
-void hap_register_post_proxy_check(int (*fct)(struct proxy *));
-void hap_register_post_server_check(int (*fct)(struct server *));
-void hap_register_post_deinit(void (*fct)());
-void hap_register_proxy_deinit(void (*fct)(struct proxy *));
-void hap_register_server_deinit(void (*fct)(struct server *));
-
-void hap_register_per_thread_alloc(int (*fct)());
-void hap_register_per_thread_init(int (*fct)());
-void hap_register_per_thread_deinit(void (*fct)());
-void hap_register_per_thread_free(int (*fct)());
-
-void mworker_accept_wrapper(int fd);
-void mworker_reload();
-
-/* simplified way to declare static build options in a file */
-#define REGISTER_BUILD_OPTS(str) \
-       INITCALL2(STG_REGISTER, hap_register_build_opts, (str), 0)
-
-/* simplified way to declare a post-check callback in a file */
-#define REGISTER_POST_CHECK(fct) \
-       INITCALL1(STG_REGISTER, hap_register_post_check, (fct))
-
-/* simplified way to declare a post-proxy-check callback in a file */
-#define REGISTER_POST_PROXY_CHECK(fct) \
-       INITCALL1(STG_REGISTER, hap_register_post_proxy_check, (fct))
-
-/* simplified way to declare a post-server-check callback in a file */
-#define REGISTER_POST_SERVER_CHECK(fct) \
-       INITCALL1(STG_REGISTER, hap_register_post_server_check, (fct))
-
-/* simplified way to declare a post-deinit callback in a file */
-#define REGISTER_POST_DEINIT(fct) \
-       INITCALL1(STG_REGISTER, hap_register_post_deinit, (fct))
-
-/* simplified way to declare a proxy-deinit callback in a file */
-#define REGISTER_PROXY_DEINIT(fct) \
-       INITCALL1(STG_REGISTER, hap_register_proxy_deinit, (fct))
-
-/* simplified way to declare a proxy-deinit callback in a file */
-#define REGISTER_SERVER_DEINIT(fct) \
-       INITCALL1(STG_REGISTER, hap_register_server_deinit, (fct))
-
-/* simplified way to declare a per-thread allocation callback in a file */
-#define REGISTER_PER_THREAD_ALLOC(fct) \
-       INITCALL1(STG_REGISTER, hap_register_per_thread_alloc, (fct))
-
-/* simplified way to declare a per-thread init callback in a file */
-#define REGISTER_PER_THREAD_INIT(fct) \
-       INITCALL1(STG_REGISTER, hap_register_per_thread_init, (fct))
-
-/* simplified way to declare a per-thread deinit callback in a file */
-#define REGISTER_PER_THREAD_DEINIT(fct) \
-       INITCALL1(STG_REGISTER, hap_register_per_thread_deinit, (fct))
-
-/* simplified way to declare a per-thread free callback in a file */
-#define REGISTER_PER_THREAD_FREE(fct) \
-       INITCALL1(STG_REGISTER, hap_register_per_thread_free, (fct))
-
-#endif /* _TYPES_GLOBAL_H */
+#endif /* _HAPROXY_GLOBAL_T_H */
 
 /*
  * Local variables:

diff --git a/include/haproxy/global.h b/include/haproxy/global.h
new file mode 100644 (file)
index 0000000..a3f952c
--- /dev/null
+++ b/include/haproxy/global.h
@@ -0,0 +1,156 @@
+/*
+ * include/haproxy/global.h
+ * Exported global variables and functions.
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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 _HAPROXY_GLOBAL_H
+#define _HAPROXY_GLOBAL_H
+
+#include <haproxy/global-t.h>
+#include <haproxy/api-t.h>
+#include <haproxy/thread.h>
+#include <haproxy/vars-t.h>
+#include <haproxy/mworker-t.h>
+
+#include <types/proxy.h>
+
+extern struct global global;
+extern int  pid;                /* current process id */
+extern int  relative_pid;       /* process id starting at 1 */
+extern unsigned long pid_bit;   /* bit corresponding to the process id */
+extern unsigned long all_proc_mask; /* mask of all processes */
+extern int  actconn;            /* # of active sessions */
+extern int  listeners;
+extern int  jobs;               /* # of active jobs (listeners, sessions, open devices) */
+extern int  unstoppable_jobs;   /* # of active jobs that can't be stopped during a soft stop */
+extern int  active_peers;       /* # of active peers (connection attempts and successes) */
+extern int  connected_peers;    /* # of really connected peers */
+extern int nb_oldpids;          /* contains the number of old pids found */
+extern const int zero;
+extern const int one;
+extern const struct linger nolinger;
+extern int stopping;   /* non zero means stopping in progress */
+extern int killed;     /* >0 means a hard-stop is triggered, >1 means hard-stop immediately */
+extern char hostname[MAX_HOSTNAME_LEN];
+extern char localpeer[MAX_HOSTNAME_LEN];
+extern unsigned int warned;     /* bitfield of a few warnings to emit just once */
+extern volatile unsigned long sleeping_thread_mask;
+extern struct list proc_list; /* list of process in mworker mode */
+extern struct mworker_proc *proc_self; /* process structure of current process */
+extern int master; /* 1 if in master, 0 otherwise */
+extern unsigned int rlim_fd_cur_at_boot;
+extern unsigned int rlim_fd_max_at_boot;
+extern int atexit_flag;
+extern unsigned char boot_seed[20];  // per-boot random seed (160 bits initially)
+extern THREAD_LOCAL struct buffer trash;
+
+int main(int argc, char **argv);
+void deinit(void);
+void run_poll_loop(void);
+int tell_old_pids(int sig);
+int delete_oldpid(int pid);
+void hap_register_build_opts(const char *str, int must_free);
+void hap_register_post_check(int (*fct)());
+void hap_register_post_proxy_check(int (*fct)(struct proxy *));
+void hap_register_post_server_check(int (*fct)(struct server *));
+void hap_register_post_deinit(void (*fct)());
+void hap_register_proxy_deinit(void (*fct)(struct proxy *));
+void hap_register_server_deinit(void (*fct)(struct server *));
+
+void hap_register_per_thread_alloc(int (*fct)());
+void hap_register_per_thread_init(int (*fct)());
+void hap_register_per_thread_deinit(void (*fct)());
+void hap_register_per_thread_free(int (*fct)());
+
+void mworker_accept_wrapper(int fd);
+void mworker_reload();
+
+/* to be used with warned and WARN_* */
+static inline int already_warned(unsigned int warning)
+{
+       if (warned & warning)
+               return 1;
+       warned |= warning;
+       return 0;
+}
+
+/* returns a mask if set, otherwise all_proc_mask */
+static inline unsigned long proc_mask(unsigned long mask)
+{
+       return mask ? mask : all_proc_mask;
+}
+
+/* returns a mask if set, otherwise all_threads_mask */
+static inline unsigned long thread_mask(unsigned long mask)
+{
+       return mask ? mask : all_threads_mask;
+}
+
+/* simplified way to declare static build options in a file */
+#define REGISTER_BUILD_OPTS(str) \
+       INITCALL2(STG_REGISTER, hap_register_build_opts, (str), 0)
+
+/* simplified way to declare a post-check callback in a file */
+#define REGISTER_POST_CHECK(fct) \
+       INITCALL1(STG_REGISTER, hap_register_post_check, (fct))
+
+/* simplified way to declare a post-proxy-check callback in a file */
+#define REGISTER_POST_PROXY_CHECK(fct) \
+       INITCALL1(STG_REGISTER, hap_register_post_proxy_check, (fct))
+
+/* simplified way to declare a post-server-check callback in a file */
+#define REGISTER_POST_SERVER_CHECK(fct) \
+       INITCALL1(STG_REGISTER, hap_register_post_server_check, (fct))
+
+/* simplified way to declare a post-deinit callback in a file */
+#define REGISTER_POST_DEINIT(fct) \
+       INITCALL1(STG_REGISTER, hap_register_post_deinit, (fct))
+
+/* simplified way to declare a proxy-deinit callback in a file */
+#define REGISTER_PROXY_DEINIT(fct) \
+       INITCALL1(STG_REGISTER, hap_register_proxy_deinit, (fct))
+
+/* simplified way to declare a proxy-deinit callback in a file */
+#define REGISTER_SERVER_DEINIT(fct) \
+       INITCALL1(STG_REGISTER, hap_register_server_deinit, (fct))
+
+/* simplified way to declare a per-thread allocation callback in a file */
+#define REGISTER_PER_THREAD_ALLOC(fct) \
+       INITCALL1(STG_REGISTER, hap_register_per_thread_alloc, (fct))
+
+/* simplified way to declare a per-thread init callback in a file */
+#define REGISTER_PER_THREAD_INIT(fct) \
+       INITCALL1(STG_REGISTER, hap_register_per_thread_init, (fct))
+
+/* simplified way to declare a per-thread deinit callback in a file */
+#define REGISTER_PER_THREAD_DEINIT(fct) \
+       INITCALL1(STG_REGISTER, hap_register_per_thread_deinit, (fct))
+
+/* simplified way to declare a per-thread free callback in a file */
+#define REGISTER_PER_THREAD_FREE(fct) \
+       INITCALL1(STG_REGISTER, hap_register_per_thread_free, (fct))
+
+#endif /* _HAPROXY_GLOBAL_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ * End:
+ */

diff --git a/include/haproxy/lb_chash.h b/include/haproxy/lb_chash.h
index 0d6410d40b636acd1139375d283559abf52ac3e4..77d790fbe33b931ecad76d2f6fa0587605102600 100644 (file)
--- a/include/haproxy/lb_chash.h
+++ b/include/haproxy/lb_chash.h
@@ -24,9 +24,9 @@
 
 #include <haproxy/api.h>
 #include <haproxy/lb_chash-t.h>
-#include <types/proxy.h>
-#include <types/server.h>
 
+struct proxy;
+struct server;
 void chash_init_server_tree(struct proxy *p);
 struct server *chash_get_next_server(struct proxy *p, struct server *srvtoavoid);
 struct server *chash_get_server_hash(struct proxy *p, unsigned int hash, const struct server *avoid);

diff --git a/include/proto/channel.h b/include/proto/channel.h
index d391a4ae03009bde3bdbfa8e7a99288aebeba1b6..354758188de516dadec16b389784289805be5d0f 100644 (file)
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -30,12 +30,12 @@
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/global.h>
 #include <haproxy/htx.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/channel.h>
-#include <types/global.h>
 #include <types/stream.h>
 #include <types/stream_interface.h>
 

diff --git a/include/proto/cli.h b/include/proto/cli.h
index 0668508ff2adb4780efc56b3a4ccdf2159754cf9..13490afb2c2e92d551fd67c444965ed6252d852c 100644 (file)
--- a/include/proto/cli.h
+++ b/include/proto/cli.h
@@ -23,10 +23,10 @@
 #ifndef _PROTO_CLI_H
 #define _PROTO_CLI_H
 
+#include <haproxy/global.h>
 #include <types/applet.h>
 #include <types/channel.h>
 #include <types/cli.h>
-#include <types/global.h>
 #include <types/stream.h>
 
 

diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index 5e17ffe555fa6fbfc872625a65309a029553ab5f..6a9aa555cdb5fb36d08b7ce0752917d64971581f 100644 (file)
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -27,7 +27,7 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/applet.h>
-#include <types/global.h>
+#include <haproxy/global-t.h>
 #include <types/proxy.h>
 #include <haproxy/freq_ctr.h>
 

diff --git a/include/proto/session.h b/include/proto/session.h
index 8a17ad91d4df63bd41b1869fd6343c22064f4619..01e2d94a74867e0d736ffe844f63fb3d473bac14 100644 (file)
--- a/include/proto/session.h
+++ b/include/proto/session.h
@@ -26,7 +26,7 @@
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 
-#include <types/global.h>
+#include <haproxy/global-t.h>
 #include <types/session.h>
 
 #include <proto/stick_table.h>

diff --git a/include/proto/task.h b/include/proto/task.h
index 17a82881364ac14084a260760f1f88fe97e9c783..85ec75a6599db9067acf547d7aa6340d8d5e55fe 100644 (file)
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -27,6 +27,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/pool.h>
+#include <haproxy/global.h>
 #include <haproxy/intops.h>
 #include <haproxy/list.h>
 #include <haproxy/ticks.h>
@@ -35,7 +36,6 @@
 #include <import/eb32sctree.h>
 #include <import/eb32tree.h>
 
-#include <types/global.h>
 #include <types/task.h>
 
 #include <haproxy/fd.h>

diff --git a/include/types/checks.h b/include/types/checks.h
index 9b914d00d61809ced31ba79dd8475b0ca4dc243b..371ed431c017f8bfe7e43ebc3e4230b4be5fac40 100644 (file)
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -23,9 +23,7 @@
 #include <haproxy/buf-t.h>
 
 #include <types/connection.h>
-#include <types/proxy.h>
 #include <haproxy/sample-t.h>
-#include <types/server.h>
 #include <types/session.h>
 #include <types/task.h>
 
@@ -133,6 +131,8 @@ enum {
        HANA_OBS_SIZE
 };
 
+struct proxy;
+struct server;
 struct check {
        enum obj_type obj_type;                 /* object type == OBJ_TYPE_CHECK */
        struct session *sess;                   /* Health check session. */

diff --git a/include/types/server.h b/include/types/server.h
index 770a472e588e67d1913b970278c58240a49cca93..a9d333e1738cc38f3b6224c95e11278938331f89 100644 (file)
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -38,7 +38,6 @@
 
 #include <types/connection.h>
 #include <haproxy/freq_ctr-t.h>
-#include <types/proxy.h>
 #include <types/queue.h>
 #include <types/ssl_sock.h>
 #include <types/task.h>
@@ -204,6 +203,7 @@ struct tree_occ {
        struct eb32_node node;
 };
 
+struct proxy;
 struct server {
        enum obj_type obj_type;                 /* object type == OBJ_TYPE_SERVER */
        enum srv_state next_state, cur_state;   /* server state among SRV_ST_* */

diff --git a/include/types/session.h b/include/types/session.h
index 70d10a84cdf4a86c403e6b264d3522b56f05bd39..3e49b461b4b9c4a358fc6d16556bdef2662be9c4 100644 (file)
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -33,7 +33,6 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/vars-t.h>
 
-#include <types/proxy.h>
 #include <types/stick_table.h>
 #include <types/task.h>
 
@@ -51,6 +50,7 @@ enum {
        SESS_FL_PREFER_LAST   = 0x00000001, /* NTML authent, we should reuse last conn */
 };
 
+struct proxy;
 struct session {
        struct proxy *fe;               /* the proxy this session depends on for the client side */
        struct listener *listener;      /* the listener by which the request arrived */

diff --git a/src/51d.c b/src/51d.c
index 2309592ddb8dbc0884ec4ac8b5c67417dfc0762d..529a8baa0a72df4faf7cee7462d536a95113a515 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -7,7 +7,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/thread.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/log.h>

diff --git a/src/acl.c b/src/acl.c
index d2187e8e5d42c4eed0eb0ee245c2a3ec98c7b327..caa9dd15207b5599ab117d3a3b6842130292b598 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -21,7 +21,7 @@
 #include <haproxy/tools.h>
 #include <common/uri_auth.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>

diff --git a/src/arg.c b/src/arg.c
index 467929b52cadcad35725c41e785698ae2cd1c296..a0f9a5972c5303c10f5323cd1bccb56c29c30f5b 100644 (file)
--- a/src/arg.c
+++ b/src/arg.c
@@ -16,7 +16,7 @@
 
 #include <haproxy/tools.h>
 #include <haproxy/chunk.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <haproxy/arg.h>
 
 const char *arg_type_names[ARGT_NBTYPES] = {

diff --git a/src/auth.c b/src/auth.c
index b28d6dd78c0a6b22a94d9ae402cec50e301afdd6..fe21a458d0a4934c324b712b8dde559ea8d32609 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -27,7 +27,7 @@
 
 #include <haproxy/auth-t.h>
 #include <haproxy/api.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <haproxy/errors.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/thread.h>

diff --git a/src/backend.c b/src/backend.c
index e12f207e4d3f1b413dddb36cafbb4cae512f4145..18ac58306a5d57bf1a9c4218e77dc5f08f6aafd2 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -35,7 +35,7 @@
 #include <haproxy/time.h>
 #include <haproxy/namespace.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>

diff --git a/src/buffer.c b/src/buffer.c
index b41716b7e246425bdfb894d752ac7ac2ad635694..e0db429c0c642f98b4c4e0805863044feaccf217 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -19,7 +19,7 @@
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 struct pool_head *pool_head_buffer;
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 6c675c4b8d5ef3d8973f5799f0c796800676e0a1..8ea64a199c82c10f11577829fe86d5933eb4be9b 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -58,7 +58,7 @@
 #include <haproxy/thread.h>
 
 #include <types/filters.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/peers.h>
 #include <types/stats.h>
 

diff --git a/src/checks.c b/src/checks.c
index 0793a82a22bf2e59a03e73311e11a23530e9c396..af34ebebb829caaf8a3861b95266e04ab86ae221 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -47,7 +47,7 @@
 #include <haproxy/htx.h>
 #include <haproxy/vars.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/stats.h>
 
 #include <haproxy/arg.h>

diff --git a/src/chunk.c b/src/chunk.c
index f9e6fe5d2278f2539dc0ab1f9b458a00777b013d..6f9aa39b3759785cb62587d45d9b2e821417d25f 100644 (file)
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -19,7 +19,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/tools.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 /* trash chunks used for various conversions */
 static THREAD_LOCAL struct buffer *trash_chunk;

diff --git a/src/cli.c b/src/cli.c
index f5f197f9708cf0d9f85d61f002c936c76e0b31f8..b9481c1f1f49a4b8ca655f96a07e75b3e3b41824 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -43,7 +43,7 @@
 #include <haproxy/base64.h>
 
 #include <types/applet.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/stats.h>
 
 #include <haproxy/activity.h>

diff --git a/src/compression.c b/src/compression.c
index 77da4057a99f8f5bf1c5f165acdc7b0c1331dae3..081bf03bed55b63701c46e02eb0a84cb633a5805 100644 (file)
--- a/src/compression.c
+++ b/src/compression.c
@@ -32,7 +32,7 @@
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <haproxy/compression-t.h>
 
 #include <proto/acl.h>

diff --git a/src/da.c b/src/da.c
index aef12a2fe346dd90c38fa8d1d1bd3932e5782eb8..20afdfc6789dc797172e646e778dfeee0f374011 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -5,7 +5,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/log.h>

diff --git a/src/debug.c b/src/debug.c
index 18fed01625f52f2d9272cdafe02169ee45ac23fb..c179652467d513d17245d93762acded037de85b9 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -28,7 +28,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/tools.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/signal.h>
 
 #include <proto/cli.h>

diff --git a/src/dns.c b/src/dns.c
index a3e02e9d10215380188340d8cc495a43a163303d..4fec311d2880e3199fafc8133360d55fa55a16b7 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -33,7 +33,7 @@
 
 #include <types/applet.h>
 #include <types/cli.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/stats.h>
 
 #include <proto/channel.h>

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index d5717e74c77b6d46aaf0d0f353f4c0057f43b3af..0a12262c8bd932ce6d0e0a38bf2ac29bf6b85f72 100644 (file)
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -15,13 +15,12 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
+#include <haproxy/global.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
-
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>
 #include <proto/signal.h>

diff --git a/src/ev_evports.c b/src/ev_evports.c
index 0a18bd3a7cd6011e902636a079053c79bb37d8d0..cfd053bb76dd74c208fb5c0ee67ca1e727588656 100644 (file)
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -23,7 +23,7 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>

diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 5746f1a2f947ae932d3eecdd234b699370aea5db..a4c3bce9901ead9181dbd466a3c3a8ef9760971b 100644 (file)
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -22,7 +22,7 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>

diff --git a/src/ev_poll.c b/src/ev_poll.c
index 344b6d4a1616172257df0e3074a90033b85a8b10..8781e6c0d0184b8760e09a9cc08e26fb586cc038 100644 (file)
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -22,7 +22,7 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>

diff --git a/src/ev_select.c b/src/ev_select.c
index 6a5d2f8b39663d270663ba06e2cff7cdccac64b9..cee5e8e70fc4420dd709cd668c4453e6b382757f 100644 (file)
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -19,7 +19,7 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <haproxy/activity.h>
 #include <haproxy/fd.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 6d02e897aa02e16aa8182a0587ad87b85e25ff5e..10a8de5428008a72b25f1e210099e5be44b5d1fc 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -19,7 +19,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <proto/acl.h>
 #include <proto/fcgi-app.h>

diff --git a/src/fd.c b/src/fd.c
index 60db19ccc1ac4cc1a8104466a3995a81e5e7c940..82f619625be7b09ffb6a14360b787f479cf26ef3 100644 (file)
--- a/src/fd.c
+++ b/src/fd.c
@@ -89,7 +89,7 @@
 
 
 #include <haproxy/api.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <haproxy/fd.h>
 #include <proto/log.h>

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 6acb9f412b7485f264047983bd18dfa0beee660b..64650ae5269fe6d67cf43d12ec2734829a1f1198 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -24,7 +24,7 @@
 #include <haproxy/vars.h>
 
 #include <haproxy/arg-t.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/spoe.h>
 
 #include <proto/acl.h>

diff --git a/src/flt_trace.c b/src/flt_trace.c
index 362040c375ce8c31a25882a0fb7220b4b05f9f57..1c200cefcae766cb83bc464e1f75613019764baa 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -20,7 +20,7 @@
 
 #include <types/channel.h>
 #include <types/filters.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 

diff --git a/src/frontend.c b/src/frontend.c
index 00c31d84e1019e46fb46c1a0e060d23ba4f0ff02..44ac1514ffb3777692c3775b8fdc9f842dee759e 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -29,7 +29,7 @@
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
+#include <haproxy/global.h>
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>

diff --git a/src/h2.c b/src/h2.c
index 7e5811346f40642ab90074a8d73ff4983b3eacf0..bd46ffca9fba1d4850334e98c28343e94f418bb1 100644 (file)
--- a/src/h2.c
+++ b/src/h2.c
@@ -32,7 +32,7 @@
 #include <haproxy/http-hdr-t.h>
 #include <haproxy/htx.h>
 #include <import/ist.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 
 struct h2_frame_definition h2_frame_definition[H2_FT_ENTRIES] =        {
         [H2_FT_DATA         ] = { .dir = 3, .min_id = 1, .max_id = H2_MAX_STREAM_ID, .min_len = 0, .max_len = H2_MAX_FRAME_LEN, },

diff --git a/src/haproxy.c b/src/haproxy.c
index 5a7cbf35b456245f436b42703baadb6ac1ec4f0b..377bb2e598d8d983307c5a7d9fb0077747d9352e 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -110,7 +110,7 @@
 #include <haproxy/capture-t.h>
 #include <types/cli.h>
 #include <types/filters.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/acl.h>
 #include <types/peers.h>
 

diff --git a/src/hpack-dec.c b/src/hpack-dec.c
index c9808d362d0cbb4c8517d9dc0a16c764e6291019..987165c64a40e3848202eb4f20d587317f5c4829 100644 (file)
--- a/src/hpack-dec.c
+++ b/src/hpack-dec.c
@@ -38,8 +38,6 @@
 #include <haproxy/h2.h>
 #include <import/ist.h>
 
-#include <types/global.h>
-
 
 #if defined(DEBUG_HPACK)
 #define hpack_debug_printf printf

diff --git a/src/hpack-enc.c b/src/hpack-enc.c
index 62c6652024e070f89d11a1e0853abebf1e7d6684..64cca7873d1d3046c625141506d604e4ffbeadd6 100644 (file)
--- a/src/hpack-enc.c
+++ b/src/hpack-enc.c
@@ -34,8 +34,6 @@
 #include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 
-#include <types/global.h>
-
 /*
  * HPACK encoding: these tables were generated using gen-enc.c
  */

diff --git a/src/hpack-tbl.c b/src/hpack-tbl.c
index 8c56a0ddb78450bc6231d78d4642f84aab58c165..ac6408c2c0ca28e7d1b134df55c905df686919cc 100644 (file)
--- a/src/hpack-tbl.c
+++ b/src/hpack-tbl.c
@@ -34,8 +34,6 @@
 #include <haproxy/hpack-tbl.h>
 #include <import/ist.h>
 
-#include <types/global.h>
-
 /* static header table as in RFC7541 Appendix A. [0] unused. */
 const struct http_hdr hpack_sht[HPACK_SHT_SIZE] = {
        [ 1] = { .n = IST(":authority"),                   .v = IST("")              },

diff --git a/src/http_acl.c b/src/http_acl.c
index b2de967aad6f22d9fb037a63730bf19da354432f..0b6adfdb019f6b37b31595c196096a93d4349b7e 100644 (file)
--- a/src/http_acl.c
+++ b/src/http_acl.c
@@ -25,8 +25,6 @@
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <types/global.h>
-
 #include <proto/acl.h>
 #include <haproxy/arg.h>
 

diff --git a/src/http_act.c b/src/http_act.c
index 0549bc018da02e2d746b4031e238bc3549f7a933..356d57287abb4faa4cfa9d9a42608f40173e76c2 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -20,6 +20,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
+#include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
@@ -32,7 +33,6 @@
 #include <haproxy/version.h>
 
 #include <haproxy/capture-t.h>
-#include <types/global.h>
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>

diff --git a/src/http_conv.c b/src/http_conv.c
index 730809a9f6f0ca010959593d3872379e33a55a26..bee2f90caa079fa50e1ddbd10772de198f9cec74 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -25,7 +25,6 @@
 #include <haproxy/version.h>
 
 #include <haproxy/capture-t.h>
-#include <types/global.h>
 
 #include <haproxy/arg.h>
 #include <proto/stream.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 634847aee6d5966fae5dcd0e54cf45d1af3e1783..6f367fed77d0d5643c2e33ac9446ce6001c5e081 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -20,6 +20,7 @@
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <haproxy/chunk.h>
+#include <haproxy/global.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
@@ -31,8 +32,6 @@
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <types/global.h>
-
 #include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>

diff --git a/src/http_htx.c b/src/http_htx.c
index d018ca5b0d47722904c0a1437698cfbbe7c6baeb..35bb2c6cae63f7a2b5350a44b33c4abfdd7447e9 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -15,9 +15,9 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
+#include <haproxy/global.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
-#include <types/global.h>
 
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>

diff --git a/src/http_rules.c b/src/http_rules.c
index 79c9936ff4432ef4da80f832d869418488376bb8..955c04f789ba071bc092e14ae1162ea63d8b8381 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -27,7 +27,6 @@
 #include <haproxy/version.h>
 
 #include <haproxy/capture-t.h>
-#include <types/global.h>
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>

diff --git a/src/lb_chash.c b/src/lb_chash.c
index 0fc18d92d3a9f9e5fc11d9f64e816abc8a67a657..4cb97ada477766cb3045dbec27555add82ce1f38 100644 (file)
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -20,7 +20,6 @@
 #include <haproxy/tools.h>
 #include <import/eb32tree.h>
 
-#include <types/global.h>
 #include <types/server.h>
 
 #include <proto/backend.h>

diff --git a/src/lb_fas.c b/src/lb_fas.c
index 72e9c9c0338dd610fcc85c7be0dbf7bdf378194a..ae1297ea11f84845c3e05e4481ea42d7c0358927 100644 (file)
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -19,7 +19,6 @@
 #include <haproxy/api.h>
 #include <import/eb32tree.h>
 
-#include <types/global.h>
 #include <types/server.h>
 
 #include <proto/backend.h>

diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index b9cc9878b3b1d67162ec82c7631d2c353449b90c..3aa050f4e4384ed916fb73affe6e780314ad99e5 100644 (file)
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -13,7 +13,6 @@
 #include <haproxy/api.h>
 #include <import/eb32tree.h>
 
-#include <types/global.h>
 #include <types/server.h>
 
 #include <proto/backend.h>

diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index 6f87697416b682c37d1553684658b7517682178c..7eafe489a746267e20cd781bc6166935c7981cce 100644 (file)
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -13,7 +13,6 @@
 #include <haproxy/api.h>
 #include <import/eb32tree.h>
 
-#include <types/global.h>
 #include <types/server.h>
 
 #include <proto/backend.h>

diff --git a/src/lb_map.c b/src/lb_map.c
index 8d2461fcf0430889a3672cac9c48503da449f0d7..c5e0f89d61932abeabf1f1001707b8dcc382b4de 100644 (file)
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -13,7 +13,6 @@
 #include <haproxy/api.h>
 #include <import/eb32tree.h>
 
-#include <types/global.h>
 #include <types/server.h>
 
 #include <proto/backend.h>

diff --git a/src/listener.c b/src/listener.c
index 3f6230ffb59803d45d100e1377a8f066daf4f22f..417a902b48d18038834e4a00971b898bb08ea926 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -21,12 +21,12 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
-#include <types/global.h>
 #include <haproxy/protocol-t.h>
 
 #include <proto/acl.h>

diff --git a/src/log.c b/src/log.c
index 2bc0990c3da340156bf24ac505aa19b722d4b6e3..d9bbecd73b804a6f797788d78b4f46615e647793 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -32,7 +32,7 @@
 #include <haproxy/version.h>
 
 #include <types/cli.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/log.h>
 
 #include <proto/applet.h>

diff --git a/src/map.c b/src/map.c
index 33f24dd9fb196f13a553d006bb4fa583741a845e..7435fb1bc0e9d7939eabd0c67a6fd3e24b8c2518 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -20,7 +20,6 @@
 
 #include <types/applet.h>
 #include <types/cli.h>
-#include <types/global.h>
 #include <types/stats.h>
 
 #include <proto/applet.h>

diff --git a/src/mworker.c b/src/mworker.c
index 4ba43d2d984c2cee15a185baf6cad89d6be52169..9e5b8260b54a6fcce00884798d0f4347858a1bb4 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -25,7 +25,7 @@
 #include <haproxy/version.h>
 
 #include <types/cli.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/peers.h>
 #include <types/signal.h>
 

diff --git a/src/namespace.c b/src/namespace.c
index 4f82c620371c898fe0844a9f6b39e8f946cea0ca..616dbea118e87b3f76e0e43d61876c74c13f4370 100644 (file)
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -16,7 +16,6 @@
 #include <haproxy/errors.h>
 #include <proto/log.h>
 #include <proto/signal.h>
-#include <types/global.h>
 
 /* Opens the namespace <ns_name> and returns the FD or -1 in case of error
  * (check errno).

diff --git a/src/pattern.c b/src/pattern.c
index 93972341a4b6c4ce324bacae5ee9d968b3f20bd1..0ec22c10db2a837b19be7a183d0f0b3e658199cb 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -15,13 +15,12 @@
 #include <errno.h>
 
 #include <haproxy/api.h>
+#include <haproxy/global.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
 
-#include <types/global.h>
-
 #include <proto/log.h>
 #include <haproxy/sample.h>
 

diff --git a/src/peers.c b/src/peers.c
index 8a07cdbf81391234f6c50c29d9a79962379dc547..3724346347135b5027f080265daa3f8cb5ad975e 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -29,7 +29,6 @@
 #include <haproxy/tools.h>
 #include <haproxy/thread.h>
 
-#include <types/global.h>
 #include <types/peers.h>
 #include <types/stats.h>
 

diff --git a/src/pipe.c b/src/pipe.c
index 992c77bd56495b9427d564b4a7c16fe893cbd014..59b8312ce32333154ab1b23a0cab5faffb623f12 100644 (file)
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -14,10 +14,10 @@
 #include <fcntl.h>
 
 #include <haproxy/api.h>
+#include <haproxy/global.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 
-#include <types/global.h>
 #include <haproxy/pipe-t.h>
 
 DECLARE_STATIC_POOL(pool_head_pipe, "pipe", sizeof(struct pipe));

diff --git a/src/pool.c b/src/pool.c
index 4ff97b66087744d5afec92ee7b6a3ed2bacb97b6..2f32b587253da7cb87a5bdb9578a6768a09b23e4 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -14,7 +14,7 @@
 #include <haproxy/api.h>
 #include <types/applet.h>
 #include <types/cli.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <types/stats.h>
 
 #include <common/cfgparse.h>

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 7d7dce4e18ca22d3a2139a3fc27f203ca7f5d54e..a0453c1bcb717eeebcf52841b5e2cc7932310e4f 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -28,14 +28,13 @@
 
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
 
-#include <types/global.h>
-
 #include <proto/connection.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index de001c2a5e402588caa88faffa38b08391637b4f..e6eae9960e91a006f8ac80014b2d480dec109514 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -33,6 +33,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
@@ -41,7 +42,6 @@
 #include <haproxy/namespace.h>
 
 #include <types/connection.h>
-#include <types/global.h>
 #include <types/stream.h>
 
 #include <haproxy/arg.h>

diff --git a/src/proto_udp.c b/src/proto_udp.c
index 93c03898f12b7ef6b6efd04df17c6ed68279160a..617df1af1421865e489690413aa76813914c50d1 100644 (file)
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -10,7 +10,6 @@
  *
  */
 
-#include <types/global.h>
 #include <haproxy/fd-t.h>
 #include <haproxy/proto_udp-t.h>
 

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index f0a38e7f6c8602661f1c145dbfbf4e6727c081aa..69253732b20e79a5a80d227ef38a01803d489ca2 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -28,14 +28,13 @@
 
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
 
-#include <types/global.h>
-
 #include <proto/connection.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>

diff --git a/src/proxy.c b/src/proxy.c
index 2b5368d7d41b60c705176ed5a011ce9c088f2f47..5d422170f2ba66d4eaffea33b141699d05893eb1 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -20,6 +20,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/listener.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
@@ -30,7 +31,6 @@
 
 #include <haproxy/capture-t.h>
 #include <types/cli.h>
-#include <types/global.h>
 #include <types/peers.h>
 #include <types/stats.h>
 

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 1ece79b33ffd500fb46bcae040579a3cb0efa08c..b5538d64ea6afd1fe266f78af31969fac8599387 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -24,6 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
+#include <haproxy/global.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -36,8 +37,6 @@
 #include <proto/stream_interface.h>
 #include <proto/task.h>
 
-#include <types/global.h>
-
 
 #if defined(USE_LINUX_SPLICE)
 

diff --git a/src/regex.c b/src/regex.c
index bebbaa798c88281d34096cf503bd28eb42ba4dc9..b2f325d7a51776d9e67efe39c9ed6c9a13be5cf8 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -15,7 +15,6 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <types/global.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
 #include <proto/log.h>

diff --git a/src/sample.c b/src/sample.c
index ef798341edce7d0f864d286a50a3ad69f3848520..828cf26f71421c1f68e8d6789917ae971622359c 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -17,11 +17,11 @@
 #include <stdio.h>
 
 #include <haproxy/api.h>
-#include <types/global.h>
 
 #include <haproxy/auth.h>
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
+#include <haproxy/global.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
 #include <haproxy/net_helper.h>

diff --git a/src/server.c b/src/server.c
index ae4f044b7236aa22a3f3ac25ab5c8cc391b59da0..ddc61873cbb3f7e3381e59263308c89bd80aaadd 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -21,13 +21,13 @@
 #include <haproxy/dict-t.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/namespace.h>
 #include <haproxy/sample.h>
 #include <haproxy/time.h>
 
 #include <types/applet.h>
 #include <types/cli.h>
-#include <types/global.h>
 #include <types/cli.h>
 #include <types/stats.h>
 

diff --git a/src/session.c b/src/session.c
index afbcf2be17c0e7dfcbc65a925549f4c3176443b3..92041f5f5c51088345cac362b47bb9b1abb70d71 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -11,12 +11,12 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/listener.h>
 #include <haproxy/pool.h>
 #include <haproxy/vars.h>
 
-#include <types/global.h>
 #include <types/session.h>
 
 #include <proto/connection.h>

diff --git a/src/shctx.c b/src/shctx.c
index 1a38b9148b140e79715498489d95a1eea3abeabd..f4002a48e05c7922278bce41a99eaf8ba4256160 100644 (file)
--- a/src/shctx.c
+++ b/src/shctx.c
@@ -14,7 +14,6 @@
 #include <sys/mman.h>
 #include <arpa/inet.h>
 #include <import/ebmbtree.h>
-#include <types/global.h>
 #include <haproxy/list.h>
 #include <haproxy/shctx.h>
 

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 6d9d713238865e1e3cf4b4f2634d7d5dbdec6dfd..c1f239a7af9746cfe2c919976086a587810fb1b2 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -48,6 +48,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern-t.h>
@@ -66,7 +67,6 @@
 
 #include <types/applet.h>
 #include <types/cli.h>
-#include <types/global.h>
 #include <types/ssl_sock.h>
 #include <types/stats.h>
 

diff --git a/src/stats.c b/src/stats.c
index 6e5393402fd6b214f79f314b56083cf72b40c2da..555b56140b74bf667dc8b4037e23f5436a7dcada 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -30,6 +30,7 @@
 #include <haproxy/debug.h>
 #include <haproxy/dns.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
@@ -47,7 +48,6 @@
 
 #include <types/applet.h>
 #include <types/cli.h>
-#include <types/global.h>
 #include <types/stats.h>
 
 #include <proto/backend.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 7026e39ca719d3c35df1a76e04c06c13781f02a0..638d30c5731f55605856871c21340b734b8232ff 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
@@ -27,7 +28,6 @@
 #include <import/ebsttree.h>
 
 #include <types/cli.h>
-#include <types/global.h>
 #include <types/stats.h>
 
 #include <haproxy/arg.h>

diff --git a/src/stream.c b/src/stream.c
index 248dfe25a40337fb54964b79b3e56024eb3a7bae..3531e52edb05b3e34f299c43518539be15bd36d3 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -22,6 +22,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/istbuf.h>
@@ -33,7 +34,6 @@
 #include <types/applet.h>
 #include <types/cli.h>
 #include <types/filters.h>
-#include <types/global.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 6a878fb7d11907d4a5bae84fd168a417f91920db..e2f8a29503d5a7dc52fee5142b7aedf90e746c0d 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -13,6 +13,7 @@
 #include <haproxy/api.h>
 #include <haproxy/capture-t.h>
 #include <common/cfgparse.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
@@ -21,7 +22,6 @@
 
 #include <haproxy/arg-t.h>
 #include <types/connection.h>
-#include <types/global.h>
 
 #include <proto/acl.h>
 #include <proto/channel.h>

diff --git a/src/thread.c b/src/thread.c
index 0ee9332d062f22b37a55788981726611f1612151..b0cbd3487e6b83f946a3b1274be89ec0c8779b63 100644 (file)
--- a/src/thread.c
+++ b/src/thread.c
@@ -26,7 +26,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
-#include <types/global.h>
+#include <haproxy/global.h>
 #include <haproxy/fd.h>
 
 struct thread_info ha_thread_info[MAX_THREADS] = { };

diff --git a/src/tools.c b/src/tools.c
index cfec66a1052fd3d2809c1548342ceefd08920cd8..6dda8aa9ab4f27a4732f9551b5075a4584dbce64 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -42,11 +42,11 @@
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>
+#include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/listener.h>
 #include <haproxy/namespace.h>
 #include <haproxy/tools.h>
-#include <types/global.h>
 #include <proto/applet.h>
 #include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>

diff --git a/src/wdt.c b/src/wdt.c
index 1248bebbb88cea6f4e0ff73c7a187c6767bdaf42..93b32248c5d8c50dd6c4f8c87fcc2e28284b8a26 100644 (file)
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -14,9 +14,9 @@
 
 #include <haproxy/api.h>
 #include <haproxy/debug.h>
+#include <haproxy/global.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
-#include <types/global.h>
 #include <types/signal.h>
 #include <proto/log.h>
 

diff --git a/src/wurfl.c b/src/wurfl.c
index 43cedf5102cf04b909b2a190304074a06b237e4c..bbc2f3d649281df023a9c8b59bab1567c8c3e1c6 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -6,8 +6,8 @@
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/http_htx.h>
-#include <types/global.h>
 #include <haproxy/arg.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>