mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
The files were moved as-is.
This commit is contained in:
Willy Tarreau 2020-06-04 10:53:16 +02:00
parent ac13aeaa89
commit eb92deb500
13 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/types/dns.h → include/haproxy/dns-t.h
View File

@ -1,5 +1,5 @@
/*
* include/types/dns.h
* include/haproxy/dns-t.h
* This file provides structures and types for DNS.
*
* Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_DNS_H
#define _TYPES_DNS_H
#ifndef _HAPROXY_DNS_T_H
#define _HAPROXY_DNS_T_H
#include <import/eb32tree.h>
@ -357,4 +357,4 @@ struct dns_srvrq {
struct list list; /* Next SRV RQ for the same proxy */
};
#endif /* _TYPES_DNS_H */
#endif /* _HAPROXY_DNS_T_H */

10
include/proto/dns.h → include/haproxy/dns.h
View File

@ -1,5 +1,5 @@
/*
* include/proto/dns.h
* include/haproxy/dns.h
* This file provides functions related to DNS protocol
*
* Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_DNS_H
#define _PROTO_DNS_H
#ifndef _HAPROXY_DNS_H
#define _HAPROXY_DNS_H
#include <haproxy/action-t.h>
#include <types/dns.h>
#include <haproxy/dns-t.h>
extern struct list dns_resolvers;
extern unsigned int dns_failed_resolutions;
@ -49,4 +49,4 @@ enum act_parse_ret dns_parse_do_resolve(const char **args, int *orig_arg, struct
int check_action_do_resolve(struct act_rule *rule, struct proxy *px, char **err);
#endif // _PROTO_DNS_H
#endif // _HAPROXY_DNS_H

2
include/proto/server.h
View File

@ -25,9 +25,9 @@
#include <unistd.h>
#include <haproxy/api.h>
#include <haproxy/dns-t.h>
#include <haproxy/time.h>
#include <types/applet.h>
#include <types/dns.h>
#include <types/proxy.h>
#include <types/queue.h>
#include <types/server.h>

2
include/types/server.h
View File

@ -25,6 +25,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <haproxy/dns-t.h>
#include <haproxy/api-t.h>
#include <haproxy/list-t.h>
#include <haproxy/thread.h>
@ -34,7 +35,6 @@
#include <types/connection.h>
#include <types/counters.h>
#include <types/dns.h>
#include <haproxy/freq_ctr-t.h>
#include <types/obj_type.h>
#include <types/proxy.h>

3
src/cfgparse.c
View File

@ -38,6 +38,7 @@
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/chunk.h>
#include <haproxy/dns.h>
#include <haproxy/errors.h>
#include <haproxy/pool.h>
#include <haproxy/tools.h>
@ -52,14 +53,12 @@
#include <types/obj_type.h>
#include <types/peers.h>
#include <types/mailers.h>
#include <types/dns.h>
#include <types/stats.h>
#include <proto/acl.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/checks.h>
#include <proto/dns.h>
#include <proto/stats.h>
#include <proto/filters.h>
#include <proto/frontend.h>

3
src/checks.c
View File

@ -34,6 +34,7 @@
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/chunk.h>
#include <haproxy/dns.h>
#include <haproxy/istbuf.h>
#include <haproxy/list.h>
#include <haproxy/regex.h>
@ -46,7 +47,6 @@
#include <haproxy/htx.h>
#include <types/global.h>
#include <types/dns.h>
#include <types/stats.h>
#include <haproxy/arg.h>
@ -67,7 +67,6 @@
#include <proto/task.h>
#include <proto/vars.h>
#include <proto/log.h>
#include <proto/dns.h>
#include <haproxy/proto_udp.h>
#include <proto/ssl_sock.h>
#include <proto/sample.h>

2
src/cli.c
View File

@ -28,6 +28,7 @@
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/dns-t.h>
#include <haproxy/list.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
@ -38,7 +39,6 @@
#include <types/applet.h>
#include <types/global.h>
#include <types/dns.h>
#include <types/stats.h>
#include <haproxy/activity.h>

3
src/dns.c
View File

@ -22,6 +22,7 @@
#include <haproxy/action.h>
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/dns.h>
#include <haproxy/errors.h>
#include <haproxy/time.h>
#include <haproxy/ticks.h>
@ -30,13 +31,11 @@
#include <types/applet.h>
#include <types/cli.h>
#include <types/global.h>
#include <types/dns.h>
#include <types/stats.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <proto/checks.h>
#include <proto/dns.h>
#include <haproxy/fd.h>
#include <proto/http_ana.h>
#include <proto/http_rules.h>

2
src/haproxy.c
View File

@ -85,6 +85,7 @@
#include <haproxy/base64.h>
#include <common/cfgparse.h>
#include <haproxy/chunk.h>
#include <haproxy/dns.h>
#include <haproxy/dynbuf.h>
#include <haproxy/errors.h>
#include <haproxy/hlua.h>
@ -130,7 +131,6 @@
#include <proto/stream.h>
#include <proto/signal.h>
#include <proto/task.h>
#include <proto/dns.h>
#include <proto/vars.h>
#include <proto/ssl_sock.h>

3
src/server.c
View File

@ -19,6 +19,7 @@
#include <common/cfgparse.h>
#include <haproxy/dict-t.h>
#include <haproxy/dns.h>
#include <haproxy/errors.h>
#include <haproxy/namespace.h>
#include <haproxy/time.h>
@ -27,7 +28,6 @@
#include <types/cli.h>
#include <types/global.h>
#include <types/cli.h>
#include <types/dns.h>
#include <types/stats.h>
#include <proto/applet.h>
@ -43,7 +43,6 @@
#include <proto/stream_interface.h>
#include <proto/stats.h>
#include <proto/task.h>
#include <proto/dns.h>
#include <netinet/tcp.h>
#include <import/ebsttree.h>

3
src/stats.c
View File

@ -28,6 +28,7 @@
#include <common/cfgparse.h>
#include <haproxy/compression.h>
#include <haproxy/debug.h>
#include <haproxy/dns.h>
#include <haproxy/http.h>
#include <haproxy/http_htx.h>
#include <haproxy/htx.h>
@ -43,14 +44,12 @@
#include <types/applet.h>
#include <types/cli.h>
#include <types/global.h>
#include <types/dns.h>
#include <types/stats.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/checks.h>
#include <proto/cli.h>
#include <proto/dns.h>
#include <proto/stats.h>
#include <haproxy/fd.h>
#include <haproxy/freq_ctr.h>

2
src/stream.c
View File

@ -18,6 +18,7 @@
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/dict.h>
#include <haproxy/dns.h>
#include <haproxy/dynbuf.h>
#include <haproxy/hlua.h>
#include <haproxy/istbuf.h>
@ -40,7 +41,6 @@
#include <proto/checks.h>
#include <proto/cli.h>
#include <proto/connection.h>
#include <proto/dns.h>
#include <proto/stats.h>
#include <haproxy/fd.h>
#include <proto/filters.h>

2
src/tools.c
View File

@ -41,12 +41,12 @@
#include <haproxy/api.h>
#include <haproxy/chunk.h>
#include <haproxy/dns.h>
#include <haproxy/hlua.h>
#include <haproxy/namespace.h>
#include <haproxy/tools.h>
#include <types/global.h>
#include <proto/applet.h>
#include <proto/dns.h>
#include <proto/listener.h>
#include <haproxy/proto_udp.h>
#include <proto/ssl_sock.h>