mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-26 11:41:50 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
stdlib and list were missing from listener.h, otherwise it was OK.
This commit is contained in:
Willy Tarreau 2020-06-04 14:58:24 +02:00
parent 546ba42c73
commit 213e99073b
29 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/prometheus-exporter/service-prometheus.c
View 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>

18
include/types/listener.h → include/haproxy/listener-t.h
View 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
@ -19,22 +19,22 @@
* 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:

13
include/proto/listener.h → include/haproxy/listener.h
View 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
@ -19,12 +19,15 @@
* 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:

2
include/haproxy/obj_type.h
View File

@ -23,11 +23,11 @@
#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>

2
include/proto/connection.h
View File

@ -24,10 +24,10 @@
#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>

2
include/proto/proxy.h
View File

@ -23,12 +23,12 @@
#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;

1
include/proto/ssl_sock.h
View 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>

2
include/types/connection.h
View 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>

1
include/types/global.h
View 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>

1
include/types/proxy.h
View 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>

1
include/types/server.h
View 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>

1
include/types/ssl_sock.h
View 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>

2
src/cfgparse-listen.c
View File

@ -18,12 +18,12 @@
#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>

2
src/cfgparse-ssl.c
View File

@ -34,11 +34,11 @@
#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>

2
src/cfgparse.c
View 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>

2
src/cli.c
View File

@ -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>

2
src/haproxy.c
View 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>
@ -119,7 +120,6 @@
#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>

2
src/listener.c
View 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>

2
src/mworker.c
View 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>

1
src/peers.c
View 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>

2
src/proto_sockpair.c
View 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>

2
src/proto_tcp.c
View 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>

2
src/proto_uxst.c
View 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>

2
src/proxy.c
View 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>

2
src/session.c
View File

@ -12,13 +12,13 @@
#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>

1
src/ssl_sock.c
View 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>

2
src/stats.c
View 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>

1
src/stream.c
View 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>

2
src/tools.c
View File

@ -43,11 +43,11 @@
#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>