]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REORG: include: move listener.h to haproxy/listener{,-t}.h
authorWilly Tarreau <w@1wt.eu>
Thu, 4 Jun 2020 12:58:24 +0000 (14:58 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 11 Jun 2020 08:18:58 +0000 (10:18 +0200)
stdlib and list were missing from listener.h, otherwise it was OK.

29 files changed:
contrib/prometheus-exporter/service-prometheus.c
include/haproxy/listener-t.h [moved from include/types/listener.h with 99% similarity]
include/haproxy/listener.h [moved from include/proto/listener.h with 97% similarity]
include/haproxy/obj_type.h
include/proto/connection.h
include/proto/proxy.h
include/proto/ssl_sock.h
include/types/connection.h
include/types/global.h
include/types/proxy.h
include/types/server.h
include/types/ssl_sock.h
src/cfgparse-listen.c
src/cfgparse-ssl.c
src/cfgparse.c
src/cli.c
src/haproxy.c
src/listener.c
src/mworker.c
src/peers.c
src/proto_sockpair.c
src/proto_tcp.c
src/proto_uxst.c
src/proxy.c
src/session.c
src/ssl_sock.c
src/stats.c
src/stream.c
src/tools.c

index 63d6919627f91b25ff7e18b163d46edf5a1bb4a4..cdced5639f6cf9eaef1dbc845379ea3244db88c0 100644 (file)
@@ -20,6 +20,7 @@
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/listener.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 
@@ -28,7 +29,6 @@
 #include <proto/applet.h>
 #include <proto/backend.h>
 #include <haproxy/compression.h>
-#include <proto/listener.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
 #include <proto/sample.h>
similarity index 99%
rename from include/types/listener.h
rename to include/haproxy/listener-t.h
index 52df218433ee9c17deb1a808dc6ab34e1d1170f9..da432d87fe6a40a3a2385456ec6a0a9598b29b8f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/types/listener.h
+ * include/haproxy/listener-t.h
  * This file defines the structures needed to manage listeners.
  *
  * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_LISTENER_H
-#define _TYPES_LISTENER_H
+#ifndef _HAPROXY_LISTENER_T_H
+#define _HAPROXY_LISTENER_T_H
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef USE_OPENSSL
-#include <haproxy/api-t.h>
-#include <haproxy/openssl-compat.h>
-#endif
+#include <import/eb32tree.h>
 
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>
+#include <haproxy/api-t.h>
 
-#include <import/eb32tree.h>
+#ifdef USE_OPENSSL
+#include <haproxy/openssl-compat.h>
+#endif
 
 /* Some pointer types reference below */
 struct task;
@@ -304,7 +304,7 @@ struct accept_queue_ring {
 };
 
 
-#endif /* _TYPES_LISTENER_H */
+#endif /* _HAPROXY_LISTENER_T_H */
 
 /*
  * Local variables:
similarity index 97%
rename from include/proto/listener.h
rename to include/haproxy/listener.h
index ca7dc9c7cfd42e0b6dd787f95927824dc5bdd6d5..3d3d1181bd9c8d0ba2609e6a0848beddd51bda12 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/proto/listener.h
+ * include/haproxy/listener.h
  * This file declares listener management primitives.
  *
  * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_LISTENER_H
-#define _PROTO_LISTENER_H
+#ifndef _HAPROXY_LISTENER_H
+#define _HAPROXY_LISTENER_H
 
+#include <stdlib.h>
 #include <string.h>
 
-#include <types/listener.h>
+#include <haproxy/api.h>
+#include <haproxy/list.h>
+#include <haproxy/listener-t.h>
 #include <types/cli.h>
 
 /* This function tries to temporarily disable a listener, depending on the OS
@@ -185,7 +188,7 @@ extern struct xfer_sock_list *xfer_sock_list;
 
 extern struct accept_queue_ring accept_queue_rings[MAX_THREADS] __attribute__((aligned(64)));
 
-#endif /* _PROTO_LISTENER_H */
+#endif /* _HAPROXY_LISTENER_H */
 
 /*
  * Local variables:
index 42235c6e8f3de078820259a11e91646d5299384d..ad4950232cee4d1742262d76fd7e10b12ec14f46 100644 (file)
 #define _HAPROXY_OBJ_TYPE_H
 
 #include <haproxy/api.h>
+#include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
 #include <types/applet.h>
 #include <types/connection.h>
-#include <types/listener.h>
 #include <types/proxy.h>
 #include <types/server.h>
 #include <types/stream.h>
index f6ea74cb390dda3ba3002f2ee608b9a2c4bb3c1f..753aea459cfd2476b2bab6022455be9b083224dc 100644 (file)
 
 #include <import/ist.h>
 #include <haproxy/api.h>
+#include <haproxy/listener-t.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <types/connection.h>
-#include <types/listener.h>
 #include <haproxy/fd.h>
 #include <proto/session.h>
 #include <proto/task.h>
index caf1c86547b8132c60ce51938a1564c12e2a1665..5e17ffe555fa6fbfc872625a65309a029553ab5f 100644 (file)
 #define _PROTO_PROXY_H
 
 #include <haproxy/api.h>
+#include <haproxy/listener-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/applet.h>
 #include <types/global.h>
 #include <types/proxy.h>
-#include <types/listener.h>
 #include <haproxy/freq_ctr.h>
 
 extern struct proxy *proxies_list;
index 2cbd60b311888915d7ac507d0776281b09efa629..e29c1e7ad8485f59f5faa81cb636a65d7dce7c7f 100644 (file)
@@ -26,7 +26,6 @@
 #include <haproxy/openssl-compat.h>
 
 #include <types/connection.h>
-#include <types/listener.h>
 #include <types/proxy.h>
 #include <types/ssl_sock.h>
 #include <types/stream_interface.h>
index d324567c70f6f587a524599feb2a445b959ce910..dfc86945e5654c8397c70cefe71eb63b079126a8 100644 (file)
@@ -28,8 +28,8 @@
 #include <haproxy/api-t.h>
 #include <import/ist.h>
 
-#include <types/listener.h>
 #include <haproxy/obj_type-t.h>
+#include <haproxy/listener-t.h>
 #include <haproxy/port_range-t.h>
 #include <haproxy/protocol-t.h>
 
index 9e60851c4e8df5fa8fd3778cd9886b64725b17b3..f753660423af6852a437bba722ff389e464ad57b 100644 (file)
@@ -28,7 +28,6 @@
 #include <haproxy/thread.h>
 
 #include <haproxy/freq_ctr-t.h>
-#include <types/listener.h>
 #include <types/proxy.h>
 #include <types/task.h>
 #include <types/vars.h>
index 362b62edb2b47879358715198d716209e039798e..af33021b1bde5e6b770a5fe00f7ef3bd241ac171 100644 (file)
@@ -43,7 +43,6 @@
 #include <types/checks.h>
 #include <types/filters.h>
 #include <haproxy/freq_ctr-t.h>
-#include <types/listener.h>
 #include <types/log.h>
 #include <types/sample.h>
 #include <types/server.h>
index e74a26814923123bc3cee15fea8416285daaa7ff..770a472e588e67d1913b970278c58240a49cca93 100644 (file)
@@ -29,6 +29,7 @@
 #include <haproxy/dns-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>
 #include <haproxy/openssl-compat.h>
index b535e4d3b3c886ebdd8344e62d9650cd50f7a7b5..f7366d3d4d0855483325928cf537b4d0809c5bb1 100644 (file)
@@ -32,6 +32,7 @@
 #include <haproxy/buf-t.h>
 #include <haproxy/thread.h>
 #include <haproxy/list-t.h>
+#include <haproxy/listener-t.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ssl_ckch-t.h>
 #include <haproxy/ssl_crtlist-t.h>
index e4bad66a4f28f521679c1ccca4d567ccf33b062a..d2bd8d45bfa21020eb43f1028cfd4f6081b81bab 100644 (file)
 #include <haproxy/compression-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/listener.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>
 #include <proto/checks.h>
 #include <proto/connection.h>
-#include <proto/listener.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
index c93c51a47e988356cc322fa48c09cc41b93cd7f9..aeb6f849274705e3c097664fe8853b3292d4b66d 100644 (file)
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <common/cfgparse.h>
+#include <haproxy/listener.h>
 #include <haproxy/openssl-compat.h>
 
 #include <types/ssl_sock.h>
 
-#include <proto/listener.h>
 #include <proto/ssl_sock.h>
 
 
index 99c5c24a4ac51f19c91f4c5c362ec8fa26734d90..1dfdbc21cfddbdd564bdfa47741a927c15a86eea 100644 (file)
@@ -47,6 +47,7 @@
 #include <haproxy/lb_fas.h>
 #include <haproxy/lb_fwlc.h>
 #include <haproxy/lb_fwrr.h>
+#include <haproxy/listener.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
@@ -68,7 +69,6 @@
 #include <proto/stats.h>
 #include <proto/filters.h>
 #include <proto/lb_map.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
index db1900dd31f8cbc71011a25076c3953e7214c60f..7eb3bc2a832b3519081a3891735e30de1d360b41 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -31,6 +31,7 @@
 #include <haproxy/dns-t.h>
 #include <haproxy/frontend.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/mworker-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -56,7 +57,6 @@
 #include <proto/pattern.h>
 #include <haproxy/pipe.h>
 #include <haproxy/protocol.h>
-#include <proto/listener.h>
 #include <proto/map.h>
 #include <proto/proxy.h>
 #include <proto/sample.h>
index a154123962f86a91ae251b4c81ec150be8ff878b..ebf9ae39a71d57a9175bd673e424ca639e56d5d7 100644 (file)
@@ -92,6 +92,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/mworker.h>
 #include <haproxy/namespace.h>
 #include <haproxy/net_helper.h>
 #include <proto/connection.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/pattern.h>
 #include <haproxy/protocol.h>
index 80289b1a172b648ff997482545af4808592d52d9..152473e085a112be70d901e821af5744533dbeb2 100644 (file)
@@ -22,6 +22,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 
@@ -33,7 +34,6 @@
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
-#include <proto/listener.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proto_sockpair.h>
 #include <proto/sample.h>
index fda50527c91ebe3d7b81466f0b044306e74ba1f3..4ba43d2d984c2cee15a185baf6cad89d6be52169 100644 (file)
@@ -20,6 +20,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/mworker.h>
 #include <haproxy/version.h>
 
@@ -30,7 +31,6 @@
 
 #include <proto/cli.h>
 #include <haproxy/fd.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/signal.h>
index 899d5b4691faf5193d7c710d7dfd31e6f5f056cb..8a07cdbf81391234f6c50c29d9a79962379dc547 100644 (file)
@@ -30,7 +30,6 @@
 #include <haproxy/thread.h>
 
 #include <types/global.h>
-#include <types/listener.h>
 #include <types/peers.h>
 #include <types/stats.h>
 
index 0bff96d883915ae8ba4636429c6e5a55b394f417..7d7dce4e18ca22d3a2139a3fc27f203ca7f5d54e 100644 (file)
@@ -29,6 +29,7 @@
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
@@ -38,7 +39,6 @@
 #include <proto/connection.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/task.h>
index 88da3313895461e2066d0f3dd92234e206f74914..2988007f4643e41e2354ab0647382fa70c9e6337 100644 (file)
@@ -35,6 +35,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/namespace.h>
 
@@ -46,7 +47,6 @@
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <haproxy/fd.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
index a3eefa95332604d899e754473b4e477d4f41b249..f0a38e7f6c8602661f1c145dbfbf4e6727c081aa 100644 (file)
@@ -29,6 +29,7 @@
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
@@ -37,7 +38,6 @@
 
 #include <proto/connection.h>
 #include <haproxy/fd.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/task.h>
index 43ae7cf9658c2226990c1a970b74242ce3867509..2b5368d7d41b60c705176ed5a011ce9c088f2f47 100644 (file)
@@ -20,6 +20,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/listener.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
 #include <haproxy/time.h>
@@ -38,7 +39,6 @@
 #include <proto/backend.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/proto_tcp.h>
 #include <proto/http_ana.h>
index 619ff069a372efe40bcf88edac5754a0b8a9af5c..f752e07ece42dcb01972e9e626ba761ee572eb63 100644 (file)
 
 #include <haproxy/api.h>
 #include <haproxy/http.h>
+#include <haproxy/listener.h>
 #include <haproxy/pool.h>
 
 #include <types/global.h>
 #include <types/session.h>
 
 #include <proto/connection.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/session.h>
index efab3af01294a525bb625c1bd10c912efac3bc00..abfef91566276300bb3dd3a1af6cdcef6dc79c36 100644 (file)
@@ -75,7 +75,6 @@
 #include <proto/cli.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/listener.h>
 #include <proto/pattern.h>
 #include <proto/proto_tcp.h>
 #include <proto/http_ana.h>
index 79fff90625459542963af349470eeeab8cfc2e2f..8f174135c13e59c6c1b8c7bfe5579122d119b9ca 100644 (file)
@@ -35,6 +35,7 @@
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
+#include <haproxy/listener.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -57,7 +58,6 @@
 #include <proto/log.h>
 #include <proto/pattern.h>
 #include <haproxy/pipe.h>
-#include <proto/listener.h>
 #include <proto/map.h>
 #include <proto/proxy.h>
 #include <proto/sample.h>
index afbf83a865eabd1d5e628720ed3befb61c08cf47..8e7697992525e6d50d3ea78e934eb4b07c8d2f9d 100644 (file)
@@ -47,7 +47,6 @@
 #include <haproxy/fd.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/session.h>
 #include <proto/stream.h>
index 2b02a24dfb0deb1467260d7511d1f9f9af4190e0..cfec66a1052fd3d2809c1548342ceefd08920cd8 100644 (file)
 #include <haproxy/chunk.h>
 #include <haproxy/dns.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 <proto/listener.h>
 #include <haproxy/proto_udp.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream_interface.h>