mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-06 23:27:04 +02:00
REORG: include: move channel.h to haproxy/channel{,-t}.h
The files were moved with no change. The callers were cleaned up a bit and a few of them had channel.h removed since not needed.
This commit is contained in:
parent
5e539c9b8d
commit
f1d32c475c
@ -1,7 +1,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <types/channel.h>
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/connection-t.h>
|
||||
#include <types/http_ana.h>
|
||||
#include <types/stream.h>
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* include/types/channel.h
|
||||
* include/haproxy/channel-t.h
|
||||
* Channel management definitions, macros and inline functions.
|
||||
*
|
||||
* Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
|
||||
@ -19,11 +19,11 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef _TYPES_CHANNEL_H
|
||||
#define _TYPES_CHANNEL_H
|
||||
#ifndef _HAPROXY_CHANNEL_T_H
|
||||
#define _HAPROXY_CHANNEL_T_H
|
||||
|
||||
#include <haproxy/api-t.h>
|
||||
#include <haproxy/buf-t.h>
|
||||
#include <haproxy/api-t.h>
|
||||
|
||||
/* The CF_* macros designate Channel Flags, which may be ORed in the bit field
|
||||
* member 'flags' in struct channel. Here we have several types of flags :
|
||||
@ -301,7 +301,7 @@ struct channel {
|
||||
long.
|
||||
*/
|
||||
|
||||
#endif /* _TYPES_CHANNEL_H */
|
||||
#endif /* _HAPROXY_CHANNEL_T_H */
|
||||
|
||||
/*
|
||||
* Local variables:
|
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* include/proto/channel.h
|
||||
* include/haproxy/channel.h
|
||||
* Channel management definitions, macros and inline functions.
|
||||
*
|
||||
* Copyright (C) 2000-2014 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,28 +19,21 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef _PROTO_CHANNEL_H
|
||||
#define _PROTO_CHANNEL_H
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#ifndef _HAPROXY_CHANNEL_H
|
||||
#define _HAPROXY_CHANNEL_H
|
||||
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/chunk.h>
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/dynbuf.h>
|
||||
#include <haproxy/global.h>
|
||||
#include <haproxy/htx.h>
|
||||
#include <haproxy/stream_interface-t.h>
|
||||
#include <haproxy/task.h>
|
||||
#include <haproxy/ticks.h>
|
||||
#include <haproxy/time.h>
|
||||
|
||||
#include <types/channel.h>
|
||||
#include <types/stream.h>
|
||||
|
||||
#include <proto/stream.h>
|
||||
#include <haproxy/task.h>
|
||||
#include <types/stream.h>
|
||||
|
||||
/* perform minimal intializations, report 0 in case of error, 1 if OK. */
|
||||
int init_channel();
|
||||
@ -1020,7 +1013,7 @@ static inline int co_getchr(struct channel *chn)
|
||||
}
|
||||
|
||||
|
||||
#endif /* _PROTO_CHANNEL_H */
|
||||
#endif /* _HAPROXY_CHANNEL_H */
|
||||
|
||||
/*
|
||||
* Local variables:
|
@ -24,9 +24,9 @@
|
||||
#define _HAPROXY_CLI_H
|
||||
|
||||
#include <haproxy/applet-t.h>
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/cli-t.h>
|
||||
#include <haproxy/global.h>
|
||||
#include <types/channel.h>
|
||||
#include <types/stream.h>
|
||||
|
||||
|
||||
|
@ -24,9 +24,9 @@
|
||||
|
||||
#include <haproxy/arg-t.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/check-t.h>
|
||||
#include <haproxy/sample-t.h>
|
||||
#include <types/channel.h>
|
||||
|
||||
struct htx *smp_prefetch_htx(struct sample *smp, struct channel *chn, struct check *check, int vol);
|
||||
int val_hdr(struct arg *arg, char **err_msg);
|
||||
|
@ -24,9 +24,9 @@
|
||||
|
||||
#include <haproxy/applet.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/stream_interface-t.h>
|
||||
#include <proto/channel.h>
|
||||
#include <types/stream.h>
|
||||
|
||||
|
||||
|
@ -21,14 +21,12 @@
|
||||
#ifndef _PROTO_FILTERS_H
|
||||
#define _PROTO_FILTERS_H
|
||||
|
||||
#include <types/channel.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <types/filters.h>
|
||||
#include <types/http_ana.h>
|
||||
#include <types/proxy.h>
|
||||
#include <types/stream.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
|
||||
extern const char *trace_flt_id;
|
||||
extern const char *http_comp_flt_id;
|
||||
extern const char *cache_store_flt_id;
|
||||
|
@ -23,8 +23,8 @@
|
||||
#define _PROTO_PROTO_HTTP_H
|
||||
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/htx.h>
|
||||
#include <types/channel.h>
|
||||
#include <types/http_ana.h>
|
||||
#include <types/stream.h>
|
||||
|
||||
|
@ -22,10 +22,9 @@
|
||||
#ifndef _TYPES_PROTO_HTTP_H
|
||||
#define _TYPES_PROTO_HTTP_H
|
||||
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/api-t.h>
|
||||
#include <haproxy/http-t.h>
|
||||
|
||||
#include <types/channel.h>
|
||||
#include <haproxy/http_htx-t.h>
|
||||
|
||||
/* These are the flags that are found in txn->flags */
|
||||
|
@ -29,6 +29,7 @@
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <haproxy/api-t.h>
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/dynbuf-t.h>
|
||||
#include <haproxy/hlua-t.h>
|
||||
#include <haproxy/list-t.h>
|
||||
@ -37,7 +38,6 @@
|
||||
#include <haproxy/stream_interface-t.h>
|
||||
#include <haproxy/vars-t.h>
|
||||
|
||||
#include <types/channel.h>
|
||||
#include <types/filters.h>
|
||||
#include <types/http_ana.h>
|
||||
#include <types/proxy.h>
|
||||
|
@ -24,7 +24,6 @@
|
||||
#include <haproxy/global.h>
|
||||
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/channel.h>
|
||||
#include <proto/log.h>
|
||||
#include <proto/proxy.h>
|
||||
#include <haproxy/sample.h>
|
||||
|
@ -12,12 +12,12 @@
|
||||
|
||||
#include <haproxy/api.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/stream_interface.h>
|
||||
#include <haproxy/tools.h>
|
||||
#include <haproxy/thread-t.h>
|
||||
#include <haproxy/activity-t.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/freq_ctr.h>
|
||||
|
||||
|
||||
|
@ -15,10 +15,10 @@
|
||||
|
||||
#include <haproxy/applet.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/list.h>
|
||||
#include <haproxy/stream_interface.h>
|
||||
#include <haproxy/task.h>
|
||||
#include <proto/channel.h>
|
||||
#include <proto/stream.h>
|
||||
|
||||
unsigned int nb_applets = 0;
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
#include <haproxy/acl.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/check.h>
|
||||
#include <haproxy/frontend.h>
|
||||
#include <haproxy/hash.h>
|
||||
@ -46,7 +47,6 @@
|
||||
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/backend.h>
|
||||
#include <proto/channel.h>
|
||||
#include <proto/log.h>
|
||||
#include <haproxy/protocol.h>
|
||||
#include <proto/http_ana.h>
|
||||
|
@ -12,6 +12,7 @@
|
||||
|
||||
#include <haproxy/action-t.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/http_htx.h>
|
||||
#include <haproxy/http_rules.h>
|
||||
@ -23,7 +24,6 @@
|
||||
#include <types/filters.h>
|
||||
#include <types/proxy.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <proto/proxy.h>
|
||||
#include <proto/filters.h>
|
||||
#include <proto/http_ana.h>
|
||||
|
@ -39,6 +39,7 @@
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/capture.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/check.h>
|
||||
#include <haproxy/chunk.h>
|
||||
#include <haproxy/connection.h>
|
||||
@ -69,7 +70,6 @@
|
||||
#include <haproxy/global.h>
|
||||
|
||||
#include <proto/backend.h>
|
||||
#include <proto/channel.h>
|
||||
#include <proto/filters.h>
|
||||
#include <proto/log.h>
|
||||
#include <haproxy/protocol.h>
|
||||
|
@ -17,8 +17,7 @@
|
||||
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/buf.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/channel.h>
|
||||
|
||||
|
||||
/* Schedule up to <bytes> more bytes to be forwarded via the channel without
|
||||
|
@ -29,6 +29,7 @@
|
||||
#include <haproxy/applet-t.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/check.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/dns-t.h>
|
||||
@ -53,7 +54,6 @@
|
||||
|
||||
#include <haproxy/activity.h>
|
||||
#include <proto/backend.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/compression.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <haproxy/freq_ctr.h>
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include <haproxy/api.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/check.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/dns.h>
|
||||
#include <haproxy/errors.h>
|
||||
@ -39,7 +40,6 @@
|
||||
|
||||
#include <haproxy/global.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <proto/http_ana.h>
|
||||
#include <proto/log.h>
|
||||
|
@ -13,12 +13,12 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel-t.h>
|
||||
#include <haproxy/http_htx.h>
|
||||
#include <haproxy/htx.h>
|
||||
#include <haproxy/tools.h>
|
||||
#include <haproxy/time.h>
|
||||
|
||||
#include <types/channel.h>
|
||||
#include <types/filters.h>
|
||||
#include <haproxy/global.h>
|
||||
#include <types/proxy.h>
|
||||
|
@ -35,7 +35,6 @@
|
||||
#include <haproxy/global.h>
|
||||
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <proto/log.h>
|
||||
#include <haproxy/proto_tcp.h>
|
||||
|
2
src/h1.c
2
src/h1.c
@ -15,8 +15,6 @@
|
||||
#include <haproxy/h1.h>
|
||||
#include <haproxy/http-hdr.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
|
||||
/* Parse the Content-Length header field of an HTTP/1 request. The function
|
||||
* checks all possible occurrences of a comma-delimited value, and verifies
|
||||
* if any of them doesn't match a previous value. It returns <0 if a value
|
||||
|
@ -122,7 +122,6 @@
|
||||
#include <haproxy/activity.h>
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/backend.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <proto/filters.h>
|
||||
#include <proto/log.h>
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include <import/ebpttree.h>
|
||||
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/http_htx.h>
|
||||
@ -53,7 +54,6 @@
|
||||
#include <types/proxy.h>
|
||||
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/channel.h>
|
||||
#include <proto/queue.h>
|
||||
#include <proto/http_ana.h>
|
||||
#include <proto/server.h>
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include <haproxy/action-t.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/base64.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/check.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/http.h>
|
||||
@ -28,7 +29,6 @@
|
||||
|
||||
#include <haproxy/capture-t.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <proto/filters.h>
|
||||
#include <proto/log.h>
|
||||
#include <proto/http_ana.h>
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include <haproxy/auth.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/base64.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/chunk.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/global.h>
|
||||
@ -35,7 +36,6 @@
|
||||
#include <haproxy/version.h>
|
||||
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/channel.h>
|
||||
#include <proto/log.h>
|
||||
#include <proto/http_ana.h>
|
||||
#include <proto/stream.h>
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
#include <haproxy/acl.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/net_helper.h>
|
||||
#include <haproxy/payload.h>
|
||||
#include <haproxy/pattern.h>
|
||||
#include <haproxy/htx.h>
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/sample.h>
|
||||
#include <proto/http_ana.h>
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
|
||||
#include <haproxy/applet.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/dict.h>
|
||||
#include <haproxy/frontend.h>
|
||||
@ -37,7 +38,6 @@
|
||||
#include <haproxy/tools.h>
|
||||
#include <haproxy/thread.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <proto/log.h>
|
||||
#include <proto/proxy.h>
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
#include <haproxy/applet-t.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/global.h>
|
||||
|
||||
@ -26,7 +27,6 @@
|
||||
|
||||
#include <haproxy/activity-t.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <proto/log.h>
|
||||
|
||||
#ifdef CONFIG_HAP_LOCAL_POOLS
|
||||
|
@ -32,6 +32,7 @@
|
||||
|
||||
#include <haproxy/action-t.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/errors.h>
|
||||
#include <haproxy/global.h>
|
||||
@ -45,7 +46,6 @@
|
||||
#include <types/stream.h>
|
||||
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <proto/log.h>
|
||||
#include <haproxy/port_range.h>
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <haproxy/base64.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/errors.h>
|
||||
#include <haproxy/ssl_ckch.h>
|
||||
@ -32,8 +33,6 @@
|
||||
|
||||
#include <import/ebsttree.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
|
||||
/* Uncommitted CKCH transaction */
|
||||
|
||||
static struct {
|
||||
|
@ -15,6 +15,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/errors.h>
|
||||
#include <haproxy/ssl_ckch.h>
|
||||
@ -27,8 +28,6 @@
|
||||
#include <import/ebpttree.h>
|
||||
#include <import/ebsttree.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
|
||||
/* release ssl bind conf */
|
||||
void ssl_sock_free_ssl_conf(struct ssl_bind_conf *conf)
|
||||
{
|
||||
|
@ -45,6 +45,7 @@
|
||||
#include <import/xxhash.h>
|
||||
|
||||
#include <haproxy/dynbuf.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/chunk.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/connection.h>
|
||||
@ -72,7 +73,6 @@
|
||||
#include <import/ebsttree.h>
|
||||
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <haproxy/freq_ctr.h>
|
||||
#include <haproxy/proto_tcp.h>
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include <haproxy/applet-t.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/check.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/compression.h>
|
||||
@ -55,7 +56,6 @@
|
||||
#include <haproxy/base64.h>
|
||||
|
||||
#include <proto/backend.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <haproxy/freq_ctr.h>
|
||||
#include <proto/log.h>
|
||||
|
@ -20,6 +20,7 @@
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/capture.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/check.h>
|
||||
#include <haproxy/cli.h>
|
||||
#include <haproxy/connection.h>
|
||||
@ -46,7 +47,6 @@
|
||||
#include <haproxy/activity.h>
|
||||
#include <haproxy/arg.h>
|
||||
#include <proto/backend.h>
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/fd.h>
|
||||
#include <proto/filters.h>
|
||||
#include <haproxy/freq_ctr.h>
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
#include <haproxy/applet.h>
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/dynbuf.h>
|
||||
#include <haproxy/http_htx.h>
|
||||
@ -30,7 +31,6 @@
|
||||
#include <haproxy/time.h>
|
||||
#include <haproxy/task.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <haproxy/pipe.h>
|
||||
#include <proto/proxy.h>
|
||||
#include <proto/stream.h>
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include <haproxy/api.h>
|
||||
#include <haproxy/capture-t.h>
|
||||
#include <common/cfgparse.h>
|
||||
#include <haproxy/channel.h>
|
||||
#include <haproxy/connection.h>
|
||||
#include <haproxy/global.h>
|
||||
#include <haproxy/list.h>
|
||||
@ -26,7 +27,6 @@
|
||||
|
||||
#include <haproxy/arg-t.h>
|
||||
|
||||
#include <proto/channel.h>
|
||||
#include <proto/log.h>
|
||||
#include <proto/proxy.h>
|
||||
#include <haproxy/stick_table.h>
|
||||
|
Loading…
Reference in New Issue
Block a user