From: Willy Tarreau Date: Thu, 4 Jun 2020 16:21:56 +0000 (+0200) Subject: REORG: include: move checks.h to haproxy/check{,-t}.h X-Git-Tag: v2.2-dev9~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4aa573da6fa6eedb486dce129ebd1805e1aa3912;p=thirdparty%2Fhaproxy.git REORG: include: move checks.h to haproxy/check{,-t}.h All includes that were not absolutely necessary were removed because checks.h happens to very often be part of dependency loops. A warning was added about this in check-t.h. The fields, enums and structs were a bit tidied because it's particularly tedious to find anything there. It would make sense to split this in two or more files (at least extract tcp-checks). The file was renamed to the singular because it was one of the rare exceptions to have an "s" appended to its name compared to the struct name. --- diff --git a/Makefile b/Makefile index 9d70f3645c..afdd7d7383 100644 --- a/Makefile +++ b/Makefile @@ -791,7 +791,7 @@ endif OBJS = src/mux_h2.o src/stream.o src/mux_fcgi.o src/cfgparse-listen.o \ src/http_ana.o src/stats.o src/mux_h1.o src/flt_spoe.o src/server.o \ - src/cfgparse.o src/checks.o src/backend.o src/log.o src/peers.o \ + src/cfgparse.o src/check.o src/backend.o src/log.o src/peers.o \ src/cli.o src/haproxy.o src/stick_table.o src/tools.o src/sample.o \ src/proxy.o src/stream_interface.o src/pattern.o src/dns.o \ src/proto_tcp.o src/listener.o src/cfgparse-global.o src/h1.o \ diff --git a/include/types/checks.h b/include/haproxy/check-t.h similarity index 95% rename from include/types/checks.h rename to include/haproxy/check-t.h index 9d05ffc8e9..832a3f5525 100644 --- a/include/types/checks.h +++ b/include/haproxy/check-t.h @@ -1,7 +1,9 @@ /* - * Health-checks. + * include/haproxy/check-t.h + * Health-checks definitions, enums, macros and bitfields. * * Copyright 2008-2009 Krzysztof Piotr Oledzki + * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -10,22 +12,25 @@ * */ -#ifndef _TYPES_CHECKS_H -#define _TYPES_CHECKS_H +#ifndef _HAPROXY_CHECKS_T_H +#define _HAPROXY_CHECKS_T_H -#include #include - #include +#include #include #include #include -#include -#include - -#include -#include -#include +#include +#include + +/* Please note: this file tends to commonly be part of circular dependencies, + * so it is important to keep its includes list to the minimum possible (i.e. + * only types whose size needs to be known). Since there are no function + * prototypes nor pointers here, forward declarations are not really necessary. + * This file oughtt to be split into multiple parts, at least regular checks vs + * tcp-checks. + */ /* enum used by check->result. Must remain in this order, as some code uses * result >= CHK_RES_PASSED to declare success. @@ -131,8 +136,99 @@ enum { HANA_OBS_SIZE }; -struct proxy; -struct server; +/* options for tcp-check connect */ +#define TCPCHK_OPT_NONE 0x0000 /* no options specified, default */ +#define TCPCHK_OPT_SEND_PROXY 0x0001 /* send proxy-protocol string */ +#define TCPCHK_OPT_SSL 0x0002 /* SSL connection */ +#define TCPCHK_OPT_LINGER 0x0004 /* Do not RST connection, let it linger */ +#define TCPCHK_OPT_DEFAULT_CONNECT 0x0008 /* Do a connect using server params */ +#define TCPCHK_OPT_IMPLICIT 0x0010 /* Implicit connect */ +#define TCPCHK_OPT_SOCKS4 0x0020 /* check the connection via socks4 proxy */ + +enum tcpcheck_send_type { + TCPCHK_SEND_UNDEF = 0, /* Send is not parsed. */ + TCPCHK_SEND_STRING, /* Send an ASCII string. */ + TCPCHK_SEND_BINARY, /* Send a binary sequence. */ + TCPCHK_SEND_STRING_LF, /* Send an ASCII log-format string. */ + TCPCHK_SEND_BINARY_LF, /* Send a binary log-format sequence. */ + TCPCHK_SEND_HTTP, /* Send an HTTP request */ +}; + +/* flags for tcp-check send */ +#define TCPCHK_SND_HTTP_FL_URI_FMT 0x0001 /* Use a log-format string for the uri */ +#define TCPCHK_SND_HTTP_FL_BODY_FMT 0x0002 /* Use a log-format string for the body */ +#define TCPCHK_SND_HTTP_FROM_OPT 0x0004 /* Send rule coming from "option httpck" directive */ + +enum tcpcheck_eval_ret { + TCPCHK_EVAL_WAIT = 0, + TCPCHK_EVAL_STOP, + TCPCHK_EVAL_CONTINUE, +}; + +enum tcpcheck_expect_type { + TCPCHK_EXPECT_UNDEF = 0, /* Match is not used. */ + TCPCHK_EXPECT_STRING, /* Matches a string. */ + TCPCHK_EXPECT_STRING_REGEX, /* Matches a regular pattern. */ + TCPCHK_EXPECT_STRING_LF, /* Matches a log-format string. */ + TCPCHK_EXPECT_BINARY, /* Matches a binary sequence on a hex-encoded text. */ + TCPCHK_EXPECT_BINARY_REGEX, /* Matches a regular pattern on a hex-encoded text. */ + TCPCHK_EXPECT_BINARY_LF, /* Matches a log-format binary sequence on a hex-encoded text. */ + TCPCHK_EXPECT_CUSTOM, /* Execute a custom function. */ + TCPCHK_EXPECT_HTTP_STATUS, /* Matches a list of codes on the HTTP status */ + TCPCHK_EXPECT_HTTP_STATUS_REGEX, /* Matches a regular pattern on the HTTP status */ + TCPCHK_EXPECT_HTTP_HEADER, /* Matches on HTTP headers */ + TCPCHK_EXPECT_HTTP_BODY, /* Matches a string oa the HTTP payload */ + TCPCHK_EXPECT_HTTP_BODY_REGEX, /* Matches a regular pattern on a HTTP payload */ + TCPCHK_EXPECT_HTTP_BODY_LF, /* Matches a log-format string on the HTTP payload */ +}; + +/* tcp-check expect flags */ +#define TCPCHK_EXPT_FL_INV 0x0001 /* Matching is inversed */ +#define TCPCHK_EXPT_FL_HTTP_HNAME_STR 0x0002 /* Exact match on the HTTP header name */ +#define TCPCHK_EXPT_FL_HTTP_HNAME_BEG 0x0004 /* Prefix match on the HTTP header name */ +#define TCPCHK_EXPT_FL_HTTP_HNAME_END 0x0008 /* Suffix match on the HTTP header name */ +#define TCPCHK_EXPT_FL_HTTP_HNAME_SUB 0x0010 /* Substring match on the HTTP header name */ +#define TCPCHK_EXPT_FL_HTTP_HNAME_REG 0x0020 /* Regex match on the HTTP header name */ +#define TCPCHK_EXPT_FL_HTTP_HNAME_FMT 0x0040 /* The HTTP header name is a log-format string */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_NONE 0x0080 /* No match on the HTTP header value */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_STR 0x0100 /* Exact match on the HTTP header value */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_BEG 0x0200 /* Prefix match on the HTTP header value */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_END 0x0400 /* Suffix match on the HTTP header value */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_SUB 0x0800 /* Substring match on the HTTP header value */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_REG 0x1000 /* Regex match on the HTTP header value*/ +#define TCPCHK_EXPT_FL_HTTP_HVAL_FMT 0x2000 /* The HTTP header value is a log-format string */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_FULL 0x4000 /* Match the full header value ( no stop on commas ) */ + +#define TCPCHK_EXPT_FL_HTTP_HNAME_TYPE 0x003E /* Mask to get matching method on header name */ +#define TCPCHK_EXPT_FL_HTTP_HVAL_TYPE 0x1F00 /* Mask to get matching method on header value */ + +/* possible actions for tcpcheck_rule->action */ +enum tcpcheck_rule_type { + TCPCHK_ACT_SEND = 0, /* send action, regular string format */ + TCPCHK_ACT_EXPECT, /* expect action, either regular or binary string */ + TCPCHK_ACT_CONNECT, /* connect action, to probe a new port */ + TCPCHK_ACT_COMMENT, /* no action, simply a comment used for logs */ + TCPCHK_ACT_ACTION_KW, /* custom registered action_kw rule. */ +}; + +#define TCPCHK_RULES_NONE 0x00000000 +#define TCPCHK_RULES_UNUSED_TCP_RS 0x00000001 /* An unused tcp-check ruleset exists */ +#define TCPCHK_RULES_UNUSED_HTTP_RS 0x00000002 /* An unused http-check ruleset exists */ +#define TCPCHK_RULES_UNUSED_RS 0x00000003 /* Mask for unused ruleset */ + +#define TCPCHK_RULES_PGSQL_CHK 0x00000010 +#define TCPCHK_RULES_REDIS_CHK 0x00000020 +#define TCPCHK_RULES_SMTP_CHK 0x00000030 +#define TCPCHK_RULES_HTTP_CHK 0x00000040 +#define TCPCHK_RULES_MYSQL_CHK 0x00000050 +#define TCPCHK_RULES_LDAP_CHK 0x00000060 +#define TCPCHK_RULES_SSL3_CHK 0x00000070 +#define TCPCHK_RULES_AGENT_CHK 0x00000080 +#define TCPCHK_RULES_SPOP_CHK 0x00000090 +/* Unused 0x000000A0..0x00000FF0 (reserverd for futur proto) */ +#define TCPCHK_RULES_TCP_CHK 0x00000FF0 +#define TCPCHK_RULES_PROTO_CHK 0x00000FF0 /* Mask to cover protocol check */ + struct check { enum obj_type obj_type; /* object type == OBJ_TYPE_CHECK */ struct session *sess; /* Health check session. */ @@ -171,14 +267,6 @@ struct check { int via_socks4; /* check the connection via socks4 proxy */ }; -#define TCPCHK_OPT_NONE 0x0000 /* no options specified, default */ -#define TCPCHK_OPT_SEND_PROXY 0x0001 /* send proxy-protocol string */ -#define TCPCHK_OPT_SSL 0x0002 /* SSL connection */ -#define TCPCHK_OPT_LINGER 0x0004 /* Do not RST connection, let it linger */ -#define TCPCHK_OPT_DEFAULT_CONNECT 0x0008 /* Do a connect using server params */ -#define TCPCHK_OPT_IMPLICIT 0x0010 /* Implicit connect */ -#define TCPCHK_OPT_SOCKS4 0x0020 /* check the connection via socks4 proxy */ - struct tcpcheck_connect { char *sni; /* server name to use for SSL connections */ char *alpn; /* ALPN to use for the SSL connection */ @@ -190,15 +278,6 @@ struct tcpcheck_connect { struct sockaddr_storage addr; /* the address to the connect */ }; -enum tcpcheck_send_type { - TCPCHK_SEND_UNDEF = 0, /* Send is not parsed. */ - TCPCHK_SEND_STRING, /* Send an ASCII string. */ - TCPCHK_SEND_BINARY, /* Send a binary sequence. */ - TCPCHK_SEND_STRING_LF, /* Send an ASCII log-format string. */ - TCPCHK_SEND_BINARY_LF, /* Send a binary log-format sequence. */ - TCPCHK_SEND_HTTP, /* Send an HTTP request */ -}; - struct tcpcheck_http_hdr { struct ist name; /* the header name */ struct list value; /* the log-format string value */ @@ -210,10 +289,6 @@ struct tcpcheck_codes { size_t num; /* number of entry in the array */ }; -#define TCPCHK_SND_HTTP_FL_URI_FMT 0x0001 /* Use a log-format string for the uri */ -#define TCPCHK_SND_HTTP_FL_BODY_FMT 0x0002 /* Use a log-format string for the body */ -#define TCPCHK_SND_HTTP_FROM_OPT 0x0004 /* Send rule coming from "option httpck" directive */ - struct tcpcheck_send { enum tcpcheck_send_type type; union { @@ -236,49 +311,6 @@ struct tcpcheck_send { }; }; -enum tcpcheck_eval_ret { - TCPCHK_EVAL_WAIT = 0, - TCPCHK_EVAL_STOP, - TCPCHK_EVAL_CONTINUE, -}; - -enum tcpcheck_expect_type { - TCPCHK_EXPECT_UNDEF = 0, /* Match is not used. */ - TCPCHK_EXPECT_STRING, /* Matches a string. */ - TCPCHK_EXPECT_STRING_REGEX, /* Matches a regular pattern. */ - TCPCHK_EXPECT_STRING_LF, /* Matches a log-format string. */ - TCPCHK_EXPECT_BINARY, /* Matches a binary sequence on a hex-encoded text. */ - TCPCHK_EXPECT_BINARY_REGEX, /* Matches a regular pattern on a hex-encoded text. */ - TCPCHK_EXPECT_BINARY_LF, /* Matches a log-format binary sequence on a hex-encoded text. */ - TCPCHK_EXPECT_CUSTOM, /* Execute a custom function. */ - TCPCHK_EXPECT_HTTP_STATUS, /* Matches a list of codes on the HTTP status */ - TCPCHK_EXPECT_HTTP_STATUS_REGEX, /* Matches a regular pattern on the HTTP status */ - TCPCHK_EXPECT_HTTP_HEADER, /* Matches on HTTP headers */ - TCPCHK_EXPECT_HTTP_BODY, /* Matches a string oa the HTTP payload */ - TCPCHK_EXPECT_HTTP_BODY_REGEX, /* Matches a regular pattern on a HTTP payload */ - TCPCHK_EXPECT_HTTP_BODY_LF, /* Matches a log-format string on the HTTP payload */ -}; - -/* tcp-check expect flags */ -#define TCPCHK_EXPT_FL_INV 0x0001 /* Matching is inversed */ -#define TCPCHK_EXPT_FL_HTTP_HNAME_STR 0x0002 /* Exact match on the HTTP header name */ -#define TCPCHK_EXPT_FL_HTTP_HNAME_BEG 0x0004 /* Prefix match on the HTTP header name */ -#define TCPCHK_EXPT_FL_HTTP_HNAME_END 0x0008 /* Suffix match on the HTTP header name */ -#define TCPCHK_EXPT_FL_HTTP_HNAME_SUB 0x0010 /* Substring match on the HTTP header name */ -#define TCPCHK_EXPT_FL_HTTP_HNAME_REG 0x0020 /* Regex match on the HTTP header name */ -#define TCPCHK_EXPT_FL_HTTP_HNAME_FMT 0x0040 /* The HTTP header name is a log-format string */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_NONE 0x0080 /* No match on the HTTP header value */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_STR 0x0100 /* Exact match on the HTTP header value */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_BEG 0x0200 /* Prefix match on the HTTP header value */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_END 0x0400 /* Suffix match on the HTTP header value */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_SUB 0x0800 /* Substring match on the HTTP header value */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_REG 0x1000 /* Regex match on the HTTP header value*/ -#define TCPCHK_EXPT_FL_HTTP_HVAL_FMT 0x2000 /* The HTTP header value is a log-format string */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_FULL 0x4000 /* Match the full header value ( no stop on commas ) */ - -#define TCPCHK_EXPT_FL_HTTP_HNAME_TYPE 0x003E /* Mask to get matching method on header name */ -#define TCPCHK_EXPT_FL_HTTP_HVAL_TYPE 0x1F00 /* Mask to get matching method on header value */ - struct tcpcheck_expect { enum tcpcheck_expect_type type; /* Type of pattern used for matching. */ unsigned int flags; /* TCPCHK_EXPT_FL_* */ @@ -318,15 +350,6 @@ struct tcpcheck_action_kw { struct act_rule *rule; }; -/* possible actions for tcpcheck_rule->action */ -enum tcpcheck_rule_type { - TCPCHK_ACT_SEND = 0, /* send action, regular string format */ - TCPCHK_ACT_EXPECT, /* expect action, either regular or binary string */ - TCPCHK_ACT_CONNECT, /* connect action, to probe a new port */ - TCPCHK_ACT_COMMENT, /* no action, simply a comment used for logs */ - TCPCHK_ACT_ACTION_KW, /* custom registered action_kw rule. */ -}; - struct tcpcheck_rule { struct list list; /* list linked to from the proxy */ enum tcpcheck_rule_type action; /* type of the rule. */ @@ -340,24 +363,6 @@ struct tcpcheck_rule { }; }; -#define TCPCHK_RULES_NONE 0x00000000 -#define TCPCHK_RULES_UNUSED_TCP_RS 0x00000001 /* An unused tcp-check ruleset exists */ -#define TCPCHK_RULES_UNUSED_HTTP_RS 0x00000002 /* An unused http-check ruleset exists */ -#define TCPCHK_RULES_UNUSED_RS 0x00000003 /* Mask for unused ruleset */ - -#define TCPCHK_RULES_PGSQL_CHK 0x00000010 -#define TCPCHK_RULES_REDIS_CHK 0x00000020 -#define TCPCHK_RULES_SMTP_CHK 0x00000030 -#define TCPCHK_RULES_HTTP_CHK 0x00000040 -#define TCPCHK_RULES_MYSQL_CHK 0x00000050 -#define TCPCHK_RULES_LDAP_CHK 0x00000060 -#define TCPCHK_RULES_SSL3_CHK 0x00000070 -#define TCPCHK_RULES_AGENT_CHK 0x00000080 -#define TCPCHK_RULES_SPOP_CHK 0x00000090 -/* Unused 0x000000A0..0x00000FF0 (reserverd for futur proto) */ -#define TCPCHK_RULES_TCP_CHK 0x00000FF0 -#define TCPCHK_RULES_PROTO_CHK 0x00000FF0 /* Mask to cover protocol check */ - /* A list of tcp-check vars, to be registered before executing a ruleset */ struct tcpcheck_var { struct ist name; /* the variable name with the scope */ @@ -379,4 +384,4 @@ struct tcpcheck_ruleset { }; -#endif /* _TYPES_CHECKS_H */ +#endif /* _HAPROXY_CHECKS_T_H */ diff --git a/include/proto/checks.h b/include/haproxy/check.h similarity index 74% rename from include/proto/checks.h rename to include/haproxy/check.h index d24943e75f..85fc49b0d9 100644 --- a/include/proto/checks.h +++ b/include/haproxy/check.h @@ -1,30 +1,33 @@ /* - include/proto/checks.h - Functions prototypes for the checks. - - Copyright (C) 2000-2009 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 -*/ + * include/haproxy/check.h + * Functions prototypes for the checks. + * + * 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 _PROTO_CHECKS_H -#define _PROTO_CHECKS_H +#ifndef _HAPROXY_CHECKS_H +#define _HAPROXY_CHECKS_H #include +#include +#include #include -#include +#include +#include const char *get_check_status_description(short check_status); const char *get_check_status_info(short check_status); @@ -88,7 +91,7 @@ int proxy_parse_external_check_opt(char **args, int cur_arg, struct proxy *curpx int set_srv_agent_send(struct server *srv, const char *send); -#endif /* _PROTO_CHECKS_H */ +#endif /* _HAPROXY_CHECKS_H */ /* * Local variables: diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h index 56597056ed..6f741e4de1 100644 --- a/include/haproxy/obj_type.h +++ b/include/haproxy/obj_type.h @@ -23,6 +23,7 @@ #define _HAPROXY_OBJ_TYPE_H #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include static inline enum obj_type obj_type(const enum obj_type *t) { diff --git a/include/proto/http_fetch.h b/include/proto/http_fetch.h index 3a7261aa89..2c844355b7 100644 --- a/include/proto/http_fetch.h +++ b/include/proto/http_fetch.h @@ -23,10 +23,10 @@ #define _PROTO_HTTP_FETCH_H #include +#include #include #include #include -#include #include struct htx *smp_prefetch_htx(struct sample *smp, struct channel *chn, struct check *check, int vol); diff --git a/include/types/proxy.h b/include/types/proxy.h index a72232f6a3..5ba68c7b92 100644 --- a/include/types/proxy.h +++ b/include/types/proxy.h @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -40,7 +41,6 @@ #include #include -#include #include #include #include diff --git a/include/types/server.h b/include/types/server.h index 38326b0a15..1f9ef1f69a 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include /* server states. Only SRV_ST_STOPPED indicates a down server. */ diff --git a/src/backend.c b/src/backend.c index 4a1b050a11..8e8618a503 100644 --- a/src/backend.c +++ b/src/backend.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -42,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 205fbef2df..943c4c8113 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -24,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/src/cfgparse.c b/src/cfgparse.c index c5b3944ba5..6051b155ee 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -67,7 +68,6 @@ #include #include #include -#include #include #include #include diff --git a/src/checks.c b/src/check.c similarity index 99% rename from src/checks.c rename to src/check.c index a9feb79d24..dfa30988d0 100644 --- a/src/checks.c +++ b/src/check.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,7 +55,6 @@ #include #include -#include #include #include #include diff --git a/src/cli.c b/src/cli.c index 4208ceabf2..63d2b58f7d 100644 --- a/src/cli.c +++ b/src/cli.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/src/dns.c b/src/dns.c index 35f12d3204..b49f62d84b 100644 --- a/src/dns.c +++ b/src/dns.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -40,7 +41,6 @@ #include #include -#include #include #include #include diff --git a/src/http_ana.c b/src/http_ana.c index 546e139573..edfacc4ffa 100644 --- a/src/http_ana.c +++ b/src/http_ana.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include #include -#include #include #include #include diff --git a/src/server.c b/src/server.c index 243dcafd3b..904cadb894 100644 --- a/src/server.c +++ b/src/server.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include #include -#include #include #include #include diff --git a/src/stats.c b/src/stats.c index 281638cfea..1f1e5cd714 100644 --- a/src/stats.c +++ b/src/stats.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -53,7 +54,6 @@ #include #include -#include #include #include #include diff --git a/src/stream.c b/src/stream.c index 28ce2e54df..2f6ff043e3 100644 --- a/src/stream.c +++ b/src/stream.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/src/vars.c b/src/vars.c index d2c87ded78..4a3b4574ff 100644 --- a/src/vars.c +++ b/src/vars.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -12,7 +13,6 @@ #include #include #include -#include /* This contains a pool of struct vars */ DECLARE_STATIC_POOL(var_pool, "vars", sizeof(struct var));