diff options
166 files changed, 237 insertions, 965 deletions
diff --git a/include/common.h b/include/common.h index d29623e7017..2444ba1fc61 100644 --- a/include/common.h +++ b/include/common.h @@ -21,7 +21,6 @@ #define ZABBIX_COMMON_H #include "sysinc.h" -#include "zbxtypes.h" #include "module.h" #include "version.h" #include "md5.h" diff --git a/include/db.h b/include/db.h index 53b95faad8f..e2d8da15a87 100644 --- a/include/db.h +++ b/include/db.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_DB_H #define ZABBIX_DB_H -#include "common.h" #include "zbxalgo.h" #include "zbxdb.h" #include "dbschema.h" diff --git a/include/dbcache.h b/include/dbcache.h index ee7f442fa40..bff0b519217 100644 --- a/include/dbcache.h +++ b/include/dbcache.h @@ -23,8 +23,6 @@ #include "sysinfo.h" //included for convenience #include "db.h" #include "comms.h" -#include "zbxalgo.h" -#include "zbxjson.h" #include "memalloc.h" #include "zbxeval.h" diff --git a/include/discovery.h b/include/discovery.h index edbab8ef2de..8018b03bcf0 100644 --- a/include/discovery.h +++ b/include/discovery.h @@ -1,4 +1,3 @@ - /* ** Zabbix ** Copyright (C) 2001-2022 Zabbix SIA diff --git a/include/disk.h b/include/disk.h index 85cdfa962d8..e544863e612 100644 --- a/include/disk.h +++ b/include/disk.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_DISK_H #define ZABBIX_DISK_H +#include "config.h" + #if !defined(_WINDOWS) && !defined(__MINGW32__) # error "This module is only available for Windows OS" #endif diff --git a/include/perfmon.h b/include/perfmon.h index 12a03797339..2202c32f7bb 100644 --- a/include/perfmon.h +++ b/include/perfmon.h @@ -20,12 +20,12 @@ #ifndef ZABBIX_PERFMON_H #define ZABBIX_PERFMON_H +#include "sysinc.h" + #if !defined(_WINDOWS) && !defined(__MINGW32__) # error "This module is only available for Windows OS" #endif -#include "sysinc.h" - /* this struct must be only modified along with mapping builtin_counter_ref[] in perfmon.c */ typedef enum { diff --git a/include/preproc.h b/include/preproc.h index d06b2b60ec5..662110dbcb6 100644 --- a/include/preproc.h +++ b/include/preproc.h @@ -20,10 +20,8 @@ #ifndef ZABBIX_PREPROC_H #define ZABBIX_PREPROC_H -#include "common.h" #include "module.h" #include "dbcache.h" -#include "zbxvariant.h" /* preprocessing step execution result */ typedef struct diff --git a/include/proxy.h b/include/proxy.h index 6170f1228a0..1ebd4b8e995 100644 --- a/include/proxy.h +++ b/include/proxy.h @@ -20,8 +20,6 @@ #ifndef ZABBIX_PROXY_H #define ZABBIX_PROXY_H -#include "zbxjson.h" -#include "comms.h" #include "dbcache.h" #define ZBX_PROXYMODE_ACTIVE 0 diff --git a/include/service_protocol.h b/include/service_protocol.h index fa0a2776a24..baad5c53ab0 100644 --- a/include/service_protocol.h +++ b/include/service_protocol.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_SERVICE_PROTOCOL_H #define ZABBIX_SERVICE_PROTOCOL_H -#include "zbxalgo.h" #include "zbxservice.h" typedef struct diff --git a/include/sha256crypt.h b/include/sha256crypt.h index aae5faf1aa6..f799f0c4f5b 100644 --- a/include/sha256crypt.h +++ b/include/sha256crypt.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_SHA256CRYPT_H #define ZABBIX_SHA256CRYPT_H -#include "common.h" +#include "sysinc.h" #define ZBX_SHA256_DIGEST_SIZE 32 diff --git a/include/symbols.h b/include/symbols.h index 0558e2fac45..da009b70d27 100644 --- a/include/symbols.h +++ b/include/symbols.h @@ -20,10 +20,10 @@ #ifndef ZABBIX_SYMBOLS_H #define ZABBIX_SYMBOLS_H -#if defined(_WINDOWS) || defined(__MINGW32__) - #include "sysinc.h" +#if defined(_WINDOWS) || defined(__MINGW32__) + /* some definitions which are not available on older MS Windows versions */ typedef enum { /* we only use below values, the rest of enumerated values are omitted here */ diff --git a/include/zbxalert.h b/include/zbxalert.h index ebf0d7ba6ab..a7a14291598 100644 --- a/include/zbxalert.h +++ b/include/zbxalert.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_ZBXALERT_H #define ZABBIX_ZBXALERT_H -#include "common.h" #include "db.h" #include "zbxipcservice.h" diff --git a/include/zbxavailability.h b/include/zbxavailability.h index 7779be6638a..b5008c208e0 100644 --- a/include/zbxavailability.h +++ b/include/zbxavailability.h @@ -21,7 +21,6 @@ #define ZABBIX_AVAILABILITY_H #include "zbxtypes.h" -#include "zbxalgo.h" #include "db.h" #define ZBX_IPC_SERVICE_AVAILABILITY "availability" diff --git a/include/zbxcompress.h b/include/zbxcompress.h index 6e42fc3c854..cdea21ca2ce 100644 --- a/include/zbxcompress.h +++ b/include/zbxcompress.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_COMPRESS_H #define ZABBIX_COMPRESS_H +#include "zbxtypes.h" + int zbx_compress(const char *in, size_t size_in, char **out, size_t *size_out); int zbx_uncompress(const char *in, size_t size_in, char *out, size_t *size_out); const char *zbx_compress_strerror(void); diff --git a/include/zbxeval.h b/include/zbxeval.h index d7d2fc0c65f..cd149aa6550 100644 --- a/include/zbxeval.h +++ b/include/zbxeval.h @@ -20,8 +20,6 @@ #ifndef ZABBIX_ZBXEVAL_H #define ZABBIX_ZBXEVAL_H -#include "common.h" -#include "zbxalgo.h" #include "zbxvariant.h" /* diff --git a/include/zbxexec.h b/include/zbxexec.h index c16904d1774..9ec549216b1 100644 --- a/include/zbxexec.h +++ b/include/zbxexec.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_ZBXEXEC_H #define ZABBIX_ZBXEXEC_H +#include "sysinc.h" + #define ZBX_EXIT_CODE_CHECKS_DISABLED 0 #define ZBX_EXIT_CODE_CHECKS_ENABLED 1 diff --git a/include/zbxipcservice.h b/include/zbxipcservice.h index c1dd5fa08e1..5695ae0e6a1 100644 --- a/include/zbxipcservice.h +++ b/include/zbxipcservice.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_ZBXIPCSERVICE_H #define ZABBIX_ZBXIPCSERVICE_H -#include "common.h" #include "zbxalgo.h" #define ZBX_IPC_SOCKET_BUFFER_SIZE 4096 diff --git a/include/zbxlld.h b/include/zbxlld.h index 198afc0808d..196a4e0c8dd 100644 --- a/include/zbxlld.h +++ b/include/zbxlld.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_LLD_H #define ZABBIX_LLD_H -#include "common.h" #include "zbxalgo.h" void zbx_lld_process_value(zbx_uint64_t itemid, zbx_uint64_t hostid, const char *value, const zbx_timespec_t *ts, unsigned char meta, diff --git a/include/zbxrtc.h b/include/zbxrtc.h index 50053cfcf64..ab44c05d245 100644 --- a/include/zbxrtc.h +++ b/include/zbxrtc.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_ZBXRTC_H #define ZABBIX_ZBXRTC_H -#include "zbxalgo.h" #include "zbxipcservice.h" typedef struct diff --git a/include/zbxserver.h b/include/zbxserver.h index db0d65fa8df..1c35b256756 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -20,12 +20,8 @@ #ifndef ZABBIX_ZBXSERVER_H #define ZABBIX_ZBXSERVER_H -#include "common.h" -#include "db.h" #include "dbcache.h" -#include "zbxjson.h" #include "zbxvariant.h" -#include "zbxeval.h" #define MACRO_TYPE_MESSAGE_NORMAL 0x00000001 #define MACRO_TYPE_MESSAGE_RECOVERY 0x00000002 diff --git a/include/zbxservice.h b/include/zbxservice.h index b351da655ed..d98de741a9b 100644 --- a/include/zbxservice.h +++ b/include/zbxservice.h @@ -21,7 +21,6 @@ #define ZABBIX_SERVICE_H #include "zbxtypes.h" -#include "zbxalgo.h" #include "db.h" #include "zbxipcservice.h" diff --git a/include/zbxvariant.h b/include/zbxvariant.h index 5494b9f2d0d..32d743261e9 100644 --- a/include/zbxvariant.h +++ b/include/zbxvariant.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_ZBXVARIANT_H #define ZABBIX_ZBXVARIANT_H -#include "common.h" #include "zbxalgo.h" typedef union diff --git a/src/libs/zbxaudit/audit.h b/src/libs/zbxaudit/audit.h index c60ff41e8d5..84c7af67cea 100644 --- a/src/libs/zbxaudit/audit.h +++ b/src/libs/zbxaudit/audit.h @@ -20,8 +20,6 @@ #ifndef ZABBIX_AUDIT_H #define ZABBIX_AUDIT_H -#include "common.h" - #include "zbxalgo.h" #include "zbxjson.h" diff --git a/src/libs/zbxcompress/compress.c b/src/libs/zbxcompress/compress.c index d9af2cddc94..31e79db8f63 100644 --- a/src/libs/zbxcompress/compress.c +++ b/src/libs/zbxcompress/compress.c @@ -17,13 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "log.h" - #include "zbxcompress.h" +#include "common.h" + #ifdef HAVE_ZLIB #include "zlib.h" +#include "log.h" #define ZBX_COMPRESS_STRERROR_LEN 512 @@ -123,7 +123,7 @@ int zbx_uncompress(const char *in, size_t size_in, char *out, size_t *size_out) #else -int zbx_compress(const char *in, size_t size_in, char **out, size_t *size_out) +int zbx_compress(const char *in, size_t size_in, char **out, size_t *size_out) { ZBX_UNUSED(in); ZBX_UNUSED(size_in); @@ -132,7 +132,7 @@ int zbx_compress(const char *in, size_t size_in, char **out, size_t *size_out) return FAIL; } -int zbx_uncompress(const char *in, size_t size_in, char *out, size_t *size_out) +int zbx_uncompress(const char *in, size_t size_in, char *out, size_t *size_out) { ZBX_UNUSED(in); ZBX_UNUSED(size_in); diff --git a/src/libs/zbxcrypto/tls.h b/src/libs/zbxcrypto/tls.h index b0f912d0fd8..1a67ce09cdf 100644 --- a/src/libs/zbxcrypto/tls.h +++ b/src/libs/zbxcrypto/tls.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_TLS_H #define ZABBIX_TLS_H +#include "config.h" + #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) #if defined(HAVE_GNUTLS) diff --git a/src/libs/zbxdbcache/dbsync.c b/src/libs/zbxdbcache/dbsync.c index d7cd555eda4..2183bc0afdb 100644 --- a/src/libs/zbxdbcache/dbsync.c +++ b/src/libs/zbxdbcache/dbsync.c @@ -19,7 +19,6 @@ #include "dbsync.h" -#include "zbxtypes.h" #include "log.h" #include "dbcache.h" #include "zbxserialize.h" diff --git a/src/libs/zbxdiag/diag.h b/src/libs/zbxdiag/diag.h index e0ed526c31a..791ac7c6736 100644 --- a/src/libs/zbxdiag/diag.h +++ b/src/libs/zbxdiag/diag.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_DIAG_H #define ZABBIX_DIAG_H -#include "common.h" #include "zbxjson.h" #include "zbxalgo.h" #include "memalloc.h" diff --git a/src/libs/zbxdiag/diag_server.c b/src/libs/zbxdiag/diag_server.c index 832c88f4a84..08b899acd98 100644 --- a/src/libs/zbxdiag/diag_server.c +++ b/src/libs/zbxdiag/diag_server.c @@ -17,16 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "diag.h" + #include "common.h" -#include "zbxalgo.h" -#include "memalloc.h" #include "../../libs/zbxdbcache/valuecache.h" #include "zbxlld.h" #include "zbxalert.h" #include "zbxdiag.h" -#include "diag.h" - /****************************************************************************** * * * Purpose: sort itemid,values_num pair by values_num in descending order * diff --git a/src/libs/zbxeval/calc.c b/src/libs/zbxeval/calc.c index 830e9e9dc84..00b9dd18304 100644 --- a/src/libs/zbxeval/calc.c +++ b/src/libs/zbxeval/calc.c @@ -17,9 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "zbxeval.h" + #include "common.h" #include "zbxalgo.h" -#include "zbxeval.h" #include "../../libs/zbxalgo/vectorimpl.h" typedef struct diff --git a/src/libs/zbxeval/parse.c b/src/libs/zbxeval/parse.c index 08106d832de..35fae087a63 100644 --- a/src/libs/zbxeval/parse.c +++ b/src/libs/zbxeval/parse.c @@ -17,12 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "../zbxalgo/vectorimpl.h" -#include "zbxvariant.h" +#include "zbxeval.h" #include "eval.h" -#include "zbxeval.h" +#include "../zbxalgo/vectorimpl.h" ZBX_VECTOR_IMPL(eval_token, zbx_eval_token_t) diff --git a/src/libs/zbxeval/query.c b/src/libs/zbxeval/query.c index d707dfe7da0..75061aa4c2b 100644 --- a/src/libs/zbxeval/query.c +++ b/src/libs/zbxeval/query.c @@ -17,12 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "zbxalgo.h" #include "eval.h" -#include "zbxeval.h" - /* The tag expression token is virtual token used during item query filter processing. */ #define ZBX_EVAL_TOKEN_TAG_EXPRESSION (1000) diff --git a/src/libs/zbxexec/execute.c b/src/libs/zbxexec/execute.c index 53f0799faf2..29db8bcae57 100644 --- a/src/libs/zbxexec/execute.c +++ b/src/libs/zbxexec/execute.c @@ -17,10 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "zbxexec.h" + #include "common.h" #include "threads.h" #include "log.h" -#include "zbxexec.h" /* the size of temporary buffer used to read from output stream */ #define PIPE_BUFFER_SIZE 4096 diff --git a/src/libs/zbxhttp/punycode.c b/src/libs/zbxhttp/punycode.c index a609dbb3d2c..b8a1d738740 100644 --- a/src/libs/zbxhttp/punycode.c +++ b/src/libs/zbxhttp/punycode.c @@ -19,7 +19,6 @@ #include "punycode.h" -#include "common.h" #include "zbxhttp.h" /****************************************************************************** diff --git a/src/libs/zbxhttp/urlencode.c b/src/libs/zbxhttp/urlencode.c index b2415ab9959..5a639c159de 100644 --- a/src/libs/zbxhttp/urlencode.c +++ b/src/libs/zbxhttp/urlencode.c @@ -17,10 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "log.h" #include "zbxhttp.h" +#include "log.h" + /****************************************************************************** * * * Purpose: replaces unsafe characters with a '%' followed by two hexadecimal * diff --git a/src/libs/zbxicmpping/icmpping.c b/src/libs/zbxicmpping/icmpping.c index 88b59c3a4e9..c183b2c5479 100644 --- a/src/libs/zbxicmpping/icmpping.c +++ b/src/libs/zbxicmpping/icmpping.c @@ -18,6 +18,7 @@ **/ #include "zbxicmpping.h" + #include "threads.h" #include "comms.h" #include "zbxexec.h" diff --git a/src/libs/zbxmedia/sms.c b/src/libs/zbxmedia/sms.c index 4f9ce966c44..28ea43ca5d5 100644 --- a/src/libs/zbxmedia/sms.c +++ b/src/libs/zbxmedia/sms.c @@ -17,11 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "zbxmedia.h" + #include "common.h" #include "log.h" -#include "zbxmedia.h" - #include <termios.h> static int write_gsm(int fd, const char *str, char *error, int max_error_len) diff --git a/src/libs/zbxmemory/memalloc.c b/src/libs/zbxmemory/memalloc.c index 449399ac895..080be17efd6 100644 --- a/src/libs/zbxmemory/memalloc.c +++ b/src/libs/zbxmemory/memalloc.c @@ -20,7 +20,6 @@ #include "memalloc.h" #include "common.h" -#include "mutexs.h" #include "log.h" /****************************************************************************** diff --git a/src/libs/zbxrtc/rtc.h b/src/libs/zbxrtc/rtc.h index f947f574425..a4f48874bb3 100644 --- a/src/libs/zbxrtc/rtc.h +++ b/src/libs/zbxrtc/rtc.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_RTC_H #define ZABBIX_RTC_H -#include "sysinc.h" #include "zbxtypes.h" #include "zbxrtc.h" diff --git a/src/libs/zbxself/selfmon_proxy.c b/src/libs/zbxself/selfmon_proxy.c index 230b71901d7..1d99f8e1ab6 100644 --- a/src/libs/zbxself/selfmon_proxy.c +++ b/src/libs/zbxself/selfmon_proxy.c @@ -17,10 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" - #include "selfmon.h" +#include "common.h" + /****************************************************************************** * * * Purpose: Returns number of processes depending on process type * diff --git a/src/libs/zbxself/selfmon_server.c b/src/libs/zbxself/selfmon_server.c index 480bc0d819b..7d35a181ab9 100644 --- a/src/libs/zbxself/selfmon_server.c +++ b/src/libs/zbxself/selfmon_server.c @@ -17,10 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" - #include "selfmon.h" +#include "common.h" + extern int CONFIG_REPORTMANAGER_FORKS; extern int CONFIG_REPORTWRITER_FORKS; diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c index 620645d11ea..290bad8d960 100644 --- a/src/libs/zbxserver/evalfunc.c +++ b/src/libs/zbxserver/evalfunc.c @@ -19,8 +19,6 @@ #include "evalfunc.h" -#include "common.h" -#include "db.h" #include "log.h" #include "zbxserver.h" #include "zbxregexp.h" diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index ac3a2ff3a87..b5176291f23 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -25,10 +25,10 @@ #include "zbxregexp.h" #include "zbxvariant.h" #include "zbxeval.h" - #include "valuecache.h" #include "macrofunc.h" #include "../zbxalgo/vectorimpl.h" + #ifdef HAVE_LIBXML2 # include <libxml/parser.h> # include <libxml/xpath.h> diff --git a/src/libs/zbxserver/get_host_from_event.h b/src/libs/zbxserver/get_host_from_event.h index acaebbec946..5eb2564eaac 100644 --- a/src/libs/zbxserver/get_host_from_event.h +++ b/src/libs/zbxserver/get_host_from_event.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_GET_HOST_FROM_EVENT_H #define ZABBIX_GET_HOST_FROM_EVENT_H -#include "db.h" #include "dbcache.h" int get_host_from_event(const DB_EVENT *event, DC_HOST *host, char *error, size_t max_error_len); diff --git a/src/libs/zbxserver/zabbix_stats_proxy.c b/src/libs/zbxserver/zabbix_stats_proxy.c index 03b178c3b5a..d0836686584 100644 --- a/src/libs/zbxserver/zabbix_stats_proxy.c +++ b/src/libs/zbxserver/zabbix_stats_proxy.c @@ -17,10 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "zbxjson.h" #include "zabbix_stats.h" +#include "common.h" + /****************************************************************************** * * * Purpose: get program type (proxy) specific internal statistics * @@ -34,5 +34,6 @@ void zbx_get_zabbix_stats_ext(struct zbx_json *json) { ZBX_UNUSED(json); + return; } diff --git a/src/libs/zbxserver/zabbix_stats_server.c b/src/libs/zbxserver/zabbix_stats_server.c index b888777e1b6..3ecf0882f13 100644 --- a/src/libs/zbxserver/zabbix_stats_server.c +++ b/src/libs/zbxserver/zabbix_stats_server.c @@ -17,8 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "zabbix_stats.h" + #include "common.h" -#include "zbxjson.h" #include "dbcache.h" #include "valuecache.h" #include "zbxlld.h" @@ -26,8 +27,6 @@ #include "zbxtrends.h" #include "zbxha.h" -#include "zabbix_stats.h" - /****************************************************************************** * * * Purpose: get program type (server) specific internal statistics * diff --git a/src/libs/zbxsysinfo/common/system.c b/src/libs/zbxsysinfo/common/system.c index b6fb702c770..6a952718484 100644 --- a/src/libs/zbxsysinfo/common/system.c +++ b/src/libs/zbxsysinfo/common/system.c @@ -23,6 +23,7 @@ #include "zbxsysinfo_common.h" #if defined(_WINDOWS) || defined(__MINGW32__) +# include "sysinfo.h" # include "perfmon.h" # pragma comment(lib, "user32.lib") #endif diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index b62243a0195..7a1ec415975 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -17,10 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "zbxconf.h" +#include "active.h" -#include "cfg.h" +#include "zbxconf.h" #include "log.h" #include "sysinfo.h" #include "logfiles/logfiles.h" @@ -28,11 +27,8 @@ #include "threads.h" #include "zbxjson.h" #include "alias.h" -#include "metrics.h" #include "zbxregexp.h" -#include "active.h" - extern unsigned char program_type; extern ZBX_THREAD_LOCAL unsigned char process_type; extern ZBX_THREAD_LOCAL int server_num, process_num; diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c index 66b875f9b60..3cfa3d47367 100644 --- a/src/zabbix_agent/cpustat.c +++ b/src/zabbix_agent/cpustat.c @@ -17,9 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "cpustat.h" + #include "common.h" #include "stats.h" -#include "cpustat.h" #ifdef _WINDOWS # include "perfstat.h" /* defined in sysinfo lib */ diff --git a/src/zabbix_agent/diskdevices.c b/src/zabbix_agent/diskdevices.c index f4d1dec90fb..255a2812e0f 100644 --- a/src/zabbix_agent/diskdevices.c +++ b/src/zabbix_agent/diskdevices.c @@ -19,8 +19,8 @@ #ifndef _WINDOWS -#include "common.h" #include "diskdevices.h" + #include "stats.h" #include "log.h" #include "mutexs.h" diff --git a/src/zabbix_agent/eventlog.c b/src/zabbix_agent/eventlog.c index 87b8ecce8ae..39d80283463 100644 --- a/src/zabbix_agent/eventlog.c +++ b/src/zabbix_agent/eventlog.c @@ -17,14 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "eventlog.h" + #include "log.h" -#include "logfiles/logfiles.h" #include "sysinfo.h" #include "zbxregexp.h" #include "winmeta.h" #include <strsafe.h> -#include "eventlog.h" #include <delayimp.h> #include <sddl.h> diff --git a/src/zabbix_agent/eventlog.h b/src/zabbix_agent/eventlog.h index 8d0a0266642..537ed6fbf60 100644 --- a/src/zabbix_agent/eventlog.h +++ b/src/zabbix_agent/eventlog.h @@ -20,6 +20,9 @@ #ifndef ZABBIX_EVENTLOG_H #define ZABBIX_EVENTLOG_H +#include "config.h" +#include "logfiles/logfiles.h" + #if !defined(_WINDOWS) && !defined(__MINGW32__) # error "This module is only available for Windows OS" #endif diff --git a/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c index bb6f8c5c39d..93352b698e4 100644 --- a/src/zabbix_agent/listener.c +++ b/src/zabbix_agent/listener.c @@ -17,15 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "listener.h" + #include "comms.h" -#include "cfg.h" #include "zbxconf.h" #include "sysinfo.h" #include "log.h" -#include "listener.h" - extern unsigned char program_type; extern ZBX_THREAD_LOCAL unsigned char process_type; extern ZBX_THREAD_LOCAL int server_num, process_num; diff --git a/src/zabbix_agent/logfiles/logfiles.c b/src/zabbix_agent/logfiles/logfiles.c index a2f5f1731d7..983729d898b 100644 --- a/src/zabbix_agent/logfiles/logfiles.c +++ b/src/zabbix_agent/logfiles/logfiles.c @@ -17,14 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "logfiles.h" + #include "log.h" #include "sysinfo.h" -#include "persistent_state.h" #include "cfg.h" #include "zbxregexp.h" -#include "logfiles.h" #if defined(_WINDOWS) || defined(__MINGW32__) # include "symbols.h" diff --git a/src/zabbix_agent/logfiles/logfiles.h b/src/zabbix_agent/logfiles/logfiles.h index 80509be0e97..1e90cf0ba9f 100644 --- a/src/zabbix_agent/logfiles/logfiles.h +++ b/src/zabbix_agent/logfiles/logfiles.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_LOGFILES_H #define ZABBIX_LOGFILES_H -#include "md5.h" #include "../metrics.h" #include "persistent_state.h" diff --git a/src/zabbix_agent/logfiles/persistent_state.c b/src/zabbix_agent/logfiles/persistent_state.c index 2f21b3ef6f0..6073c1b92f9 100644 --- a/src/zabbix_agent/logfiles/persistent_state.c +++ b/src/zabbix_agent/logfiles/persistent_state.c @@ -17,11 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "md5.h" +#include "persistent_state.h" + #include "log.h" #include "logfiles.h" -#include "persistent_state.h" #include "zbxjson.h" #include "../../libs/zbxalgo/vectorimpl.h" diff --git a/src/zabbix_agent/perfstat.c b/src/zabbix_agent/perfstat.c index f2e8256030d..3f3c173f68e 100644 --- a/src/zabbix_agent/perfstat.c +++ b/src/zabbix_agent/perfstat.c @@ -17,9 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "stats.h" #include "perfstat.h" + +#include "stats.h" #include "alias.h" #include "log.h" #include "mutexs.h" diff --git a/src/zabbix_agent/procstat.c b/src/zabbix_agent/procstat.c index 9ab570ff433..e7b8613df34 100644 --- a/src/zabbix_agent/procstat.c +++ b/src/zabbix_agent/procstat.c @@ -17,12 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "procstat.h" + #include "log.h" #include "stats.h" #include "ipc.h" -#include "procstat.h" #ifdef ZBX_PROCSTAT_COLLECTOR diff --git a/src/zabbix_agent/procstat.h b/src/zabbix_agent/procstat.h index ccd126e49d0..161b2ff811e 100644 --- a/src/zabbix_agent/procstat.h +++ b/src/zabbix_agent/procstat.h @@ -20,8 +20,13 @@ #ifndef ZABBIX_PROCSTAT_H #define ZABBIX_PROCSTAT_H +#include "config.h" + #ifdef ZBX_PROCSTAT_COLLECTOR +#include "zbxalgo.h" +#include "zbxtypes.h" + #define ZBX_PROCSTAT_CPU_USER 0x01 #define ZBX_PROCSTAT_CPU_SYSTEM 0x02 #define ZBX_PROCSTAT_CPU_TOTAL (ZBX_PROCSTAT_CPU_USER | ZBX_PROCSTAT_CPU_SYSTEM) diff --git a/src/zabbix_agent/stats.c b/src/zabbix_agent/stats.c index acab286a53c..22187800a13 100644 --- a/src/zabbix_agent/stats.c +++ b/src/zabbix_agent/stats.c @@ -17,14 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "log.h" - #include "stats.h" -#ifndef _WINDOWS -# include "diskdevices.h" -#endif +#include "log.h" #include "mutexs.h" @@ -35,11 +30,6 @@ extern int get_cpu_num_win32(void); #else # include "daemon.h" -# include "ipc.h" -#endif - -#if defined(HAVE_KSTAT_H) && defined(HAVE_VMINFO_T_UPDATES) -# include "zbxkstat.h" #endif ZBX_COLLECTOR_DATA *collector = NULL; diff --git a/src/zabbix_agent/vmstats.c b/src/zabbix_agent/vmstats.c index 176bbddc2e6..e6c9480d76d 100644 --- a/src/zabbix_agent/vmstats.c +++ b/src/zabbix_agent/vmstats.c @@ -17,11 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "vmstats.h" #ifdef _AIX -#include "vmstats.h" #include "log.h" #ifndef XINTFRAC /* defined in IBM AIX 7.1 libperfstat.h, not defined in AIX 6.1 */ diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 7bc5b4cd9d8..de0639099a8 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -17,10 +17,6 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "sysinfo.h" - -#include "cfg.h" #include "log.h" #include "zbxconf.h" #include "zbxgetopt.h" diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c index b8104ea3a86..d03335f2811 100644 --- a/src/zabbix_agent/zbxconf.c +++ b/src/zabbix_agent/zbxconf.c @@ -17,14 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "cfg.h" +#include "zbxconf.h" + #include "log.h" #include "alias.h" #include "sysinfo.h" -#include "zbxconf.h" - #ifdef _WINDOWS # include "perfstat.h" #endif diff --git a/src/zabbix_agent/zbxkstat.c b/src/zabbix_agent/zbxkstat.c index ed3bfaddcef..9df45a4ce82 100644 --- a/src/zabbix_agent/zbxkstat.c +++ b/src/zabbix_agent/zbxkstat.c @@ -17,11 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "zbxkstat.h" #if defined(HAVE_KSTAT_H) && defined(HAVE_VMINFO_T_UPDATES) -#include "zbxkstat.h" #include "mutexs.h" #include "log.h" #include "stats.h" diff --git a/src/zabbix_agent/zbxkstat.h b/src/zabbix_agent/zbxkstat.h index 6788f533815..eb63ce6f5de 100644 --- a/src/zabbix_agent/zbxkstat.h +++ b/src/zabbix_agent/zbxkstat.h @@ -17,15 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" - #ifndef ZABBIX_ZBXKSTAT_H #define ZABBIX_ZBXKSTAT_H -#if defined(HAVE_KSTAT_H) && defined(HAVE_VMINFO_T_UPDATES) - #include "zbxtypes.h" +#if defined(HAVE_KSTAT_H) && defined(HAVE_VMINFO_T_UPDATES) + typedef struct { zbx_uint64_t freemem; diff --git a/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c index a6be6e28b25..79dd22bbf06 100644 --- a/src/zabbix_proxy/datasender/datasender.c +++ b/src/zabbix_proxy/datasender/datasender.c @@ -17,21 +17,18 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "datasender.h" + #include "comms.h" #include "db.h" #include "log.h" #include "daemon.h" -#include "zbxjson.h" #include "proxy.h" #include "zbxself.h" -#include "dbcache.h" #include "zbxtasks.h" #include "zbxcrypto.h" #include "zbxcompress.h" -#include "datasender.h" - extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; extern ZBX_THREAD_LOCAL int server_num, process_num; diff --git a/src/zabbix_proxy/events.c b/src/zabbix_proxy/events.c index 3ac4735719e..0c92b030d01 100644 --- a/src/zabbix_proxy/events.c +++ b/src/zabbix_proxy/events.c @@ -17,9 +17,6 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "zbxalgo.h" -#include "db.h" #include "../zabbix_server/events.h" void zbx_initialize_events(void) diff --git a/src/zabbix_proxy/heart/heart.c b/src/zabbix_proxy/heart/heart.c index dbdc26cbe46..53b56029f63 100644 --- a/src/zabbix_proxy/heart/heart.c +++ b/src/zabbix_proxy/heart/heart.c @@ -17,13 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "heart.h" + #include "daemon.h" #include "log.h" #include "zbxjson.h" #include "zbxself.h" -#include "heart.h" #include "zbxcrypto.h" #include "zbxcompress.h" #include "comms.h" diff --git a/src/zabbix_proxy/housekeeper/housekeeper.c b/src/zabbix_proxy/housekeeper/housekeeper.c index 64bd5eeff74..f31c097dcbf 100644 --- a/src/zabbix_proxy/housekeeper/housekeeper.c +++ b/src/zabbix_proxy/housekeeper/housekeeper.c @@ -17,15 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" +#include "housekeeper.h" + #include "log.h" #include "daemon.h" #include "zbxself.h" #include "dbcache.h" #include "zbxrtc.h" -#include "housekeeper.h" extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; diff --git a/src/zabbix_proxy/preprocessing.c b/src/zabbix_proxy/preprocessing.c deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/zabbix_proxy/preprocessing.c +++ /dev/null diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index e1d68773e85..1cc1e191c0b 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -17,26 +17,21 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "proxy.h" #include "cfg.h" -#include "pid.h" #include "db.h" -#include "dbcache.h" #include "zbxdbupgrade.h" #include "log.h" #include "zbxgetopt.h" #include "mutexs.h" -#include "proxy.h" #include "sysinfo.h" #include "zbxmodules.h" -#include "zbxserver.h" #include "zbxnix.h" #include "daemon.h" #include "zbxself.h" -#include "../libs/zbxnix/control.h" #include "../zabbix_server/dbsyncer/dbsyncer.h" #include "../zabbix_server/discoverer/discoverer.h" @@ -55,12 +50,10 @@ #include "../zabbix_server/vmware/vmware.h" #include "setproctitle.h" #include "zbxcrypto.h" -#include "zbxipcservice.h" #include "../zabbix_server/preprocessor/preproc_manager.h" #include "../zabbix_server/preprocessor/preproc_worker.h" #include "../zabbix_server/availability/avail_manager.h" #include "zbxvault.h" -#include "zbxdiag.h" #include "sighandler.h" #include "zbxrtc.h" diff --git a/src/zabbix_proxy/proxy_lld.c b/src/zabbix_proxy/proxy_lld.c index 112250e0e8c..264222bdc29 100644 --- a/src/zabbix_proxy/proxy_lld.c +++ b/src/zabbix_proxy/proxy_lld.c @@ -17,11 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "module.h" - #include "zbxlld.h" +#include "module.h" + void zbx_lld_process_agent_result(zbx_uint64_t itemid, zbx_uint64_t hostid, AGENT_RESULT *result, zbx_timespec_t *ts, char *error) { ZBX_UNUSED(itemid); diff --git a/src/zabbix_proxy/proxyconfig/proxyconfig.c b/src/zabbix_proxy/proxyconfig/proxyconfig.c index 548ffd5758f..886a86ecb76 100644 --- a/src/zabbix_proxy/proxyconfig/proxyconfig.c +++ b/src/zabbix_proxy/proxyconfig/proxyconfig.c @@ -17,14 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" +#include "proxyconfig.h" + #include "log.h" #include "daemon.h" #include "proxy.h" #include "zbxself.h" -#include "proxyconfig.h" #include "zbxcrypto.h" #include "zbxcompress.h" #include "zbxrtc.h" diff --git a/src/zabbix_proxy/taskmanager/server_tasks.c b/src/zabbix_proxy/taskmanager/server_tasks.c index cb35acb2ad7..dde9c0987ca 100644 --- a/src/zabbix_proxy/taskmanager/server_tasks.c +++ b/src/zabbix_proxy/taskmanager/server_tasks.c @@ -17,13 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "zbxalgo.h" -#include "zbxdb.h" -#include "db.h" - #include "zbxtasks.h" +#include "db.h" + /****************************************************************************** * * * Purpose: get tasks scheduled to be executed on the server * diff --git a/src/zabbix_proxy/taskmanager/taskmanager.c b/src/zabbix_proxy/taskmanager/taskmanager.c index 726ce2dded0..8e38c63880a 100644 --- a/src/zabbix_proxy/taskmanager/taskmanager.c +++ b/src/zabbix_proxy/taskmanager/taskmanager.c @@ -17,19 +17,17 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "taskmanager.h" + #include "daemon.h" #include "zbxself.h" #include "zbxtasks.h" #include "log.h" -#include "db.h" -#include "dbcache.h" #include "zbxcrypto.h" #include "zbxdiag.h" #include "zbxrtc.h" #include "../../zabbix_server/scripts/scripts.h" -#include "taskmanager.h" #include "../../zabbix_server/trapper/trapper_item_test.h" #include "../../zabbix_server/poller/checks_snmp.h" diff --git a/src/zabbix_sender/win32/zabbix_sender.c b/src/zabbix_sender/win32/zabbix_sender.c index e00beda17f7..537ee31f60a 100644 --- a/src/zabbix_sender/win32/zabbix_sender.c +++ b/src/zabbix_sender/win32/zabbix_sender.c @@ -17,13 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "zabbix_sender.h" + #include "zbxjson.h" #include "comms.h" #include "cfg.h" -#include "zabbix_sender.h" - const char *progname = NULL; const char title_message[] = ""; const char *usage_message[] = {NULL}; diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index 7c931d3037a..76c039a731a 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -17,8 +17,6 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" - #include "threads.h" #include "comms.h" #include "cfg.h" diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index e2a72090128..a17b57e55d9 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -17,16 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" +#include "actions.h" + #include "log.h" #include "zbxserver.h" #include "operations.h" #include "zbxregexp.h" #include "../../libs/zbxaudit/audit.h" -#include "actions.h" - /****************************************************************************** * * * Purpose: compare events by objectid * diff --git a/src/zabbix_server/actions.h b/src/zabbix_server/actions.h index 641a91a48a8..f3b81c63043 100644 --- a/src/zabbix_server/actions.h +++ b/src/zabbix_server/actions.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_ACTIONS_H #define ZABBIX_ACTIONS_H -#include "common.h" #include "db.h" #define ZBX_ACTION_RECOVERY_NONE 0 diff --git a/src/zabbix_server/alerter/alert_manager.c b/src/zabbix_server/alerter/alert_manager.c index e160680ca84..4da675f3e2f 100644 --- a/src/zabbix_server/alerter/alert_manager.c +++ b/src/zabbix_server/alerter/alert_manager.c @@ -17,20 +17,16 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "alert_manager.h" #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "zbxipcservice.h" -#include "zbxalgo.h" #include "zbxserver.h" #include "alerter_protocol.h" -#include "alert_manager.h" #include "zbxmedia.h" #include "zbxembed.h" #include "zbxserialize.h" -#include "zbxalert.h" #define ZBX_AM_LOCATION_NOWHERE 0 #define ZBX_AM_LOCATION_QUEUE 1 diff --git a/src/zabbix_server/alerter/alert_syncer.c b/src/zabbix_server/alerter/alert_syncer.c index 6723215652d..6dac2822384 100644 --- a/src/zabbix_server/alerter/alert_syncer.c +++ b/src/zabbix_server/alerter/alert_syncer.c @@ -17,19 +17,15 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "alert_syncer.h" + #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "db.h" -#include "zbxipcservice.h" -#include "zbxjson.h" #include "alerter_protocol.h" -#include "zbxservice.h" #include "service_protocol.h" #include "../../libs/zbxalgo/vectorimpl.h" - -#include "alert_syncer.h" +#include "dbcache.h" #define ZBX_POLL_INTERVAL 1 diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c index 699a42e4b26..09e6ecc3a5c 100644 --- a/src/zabbix_server/alerter/alerter.c +++ b/src/zabbix_server/alerter/alerter.c @@ -17,7 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "alerter.h" + #include "log.h" #include "daemon.h" #include "zbxmedia.h" @@ -28,8 +29,6 @@ #include "alerter_protocol.h" #include "zbxembed.h" -#include "alerter.h" - #define ALARM_ACTION_TIMEOUT 40 extern ZBX_THREAD_LOCAL unsigned char process_type; diff --git a/src/zabbix_server/alerter/alerter_protocol.c b/src/zabbix_server/alerter/alerter_protocol.c index 410b1eff50b..ed75b874021 100644 --- a/src/zabbix_server/alerter/alerter_protocol.c +++ b/src/zabbix_server/alerter/alerter_protocol.c @@ -17,15 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "alerter_protocol.h" + #include "log.h" #include "zbxserialize.h" -#include "zbxalgo.h" -#include "zbxipcservice.h" -#include "zbxalert.h" -#include "db.h" - -#include "alerter_protocol.h" void zbx_am_db_mediatype_clear(zbx_am_db_mediatype_t *mediatype) { diff --git a/src/zabbix_server/alerter/alerter_protocol.h b/src/zabbix_server/alerter/alerter_protocol.h index f02b280c793..affb4469162 100644 --- a/src/zabbix_server/alerter/alerter_protocol.h +++ b/src/zabbix_server/alerter/alerter_protocol.h @@ -20,8 +20,6 @@ #ifndef ZABBIX_ALERTER_PROTOCOL_H #define ZABBIX_ALERTER_PROTOCOL_H -#include "common.h" -#include "zbxalgo.h" #include "zbxalert.h" #define ZBX_IPC_SERVICE_ALERTER "alerter" diff --git a/src/zabbix_server/availability/avail_manager.c b/src/zabbix_server/availability/avail_manager.c index 7f54bb4f025..091b78f7a2b 100644 --- a/src/zabbix_server/availability/avail_manager.c +++ b/src/zabbix_server/availability/avail_manager.c @@ -17,6 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "avail_manager.h" + #include "log.h" #include "zbxself.h" #include "zbxavailability.h" @@ -24,10 +26,8 @@ #include "daemon.h" #include "sighandler.h" #include "dbcache.h" -#include "zbxalgo.h" #include "avail_protocol.h" -#include "avail_manager.h" extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; diff --git a/src/zabbix_server/dbconfig/dbconfig.c b/src/zabbix_server/dbconfig/dbconfig.c index 4509d3eb4d6..50969165ba0 100644 --- a/src/zabbix_server/dbconfig/dbconfig.c +++ b/src/zabbix_server/dbconfig/dbconfig.c @@ -17,13 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "dbconfig.h" -#include "db.h" #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "dbconfig.h" #include "dbcache.h" #include "zbxrtc.h" diff --git a/src/zabbix_server/dbsyncer/dbsyncer.c b/src/zabbix_server/dbsyncer/dbsyncer.c index 24c7b7d7df5..b7f0b62a7a9 100644 --- a/src/zabbix_server/dbsyncer/dbsyncer.c +++ b/src/zabbix_server/dbsyncer/dbsyncer.c @@ -17,16 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "dbsyncer.h" -#include "db.h" #include "log.h" #include "daemon.h" #include "zbxself.h" #include "sighandler.h" #include "dbcache.h" -#include "dbsyncer.h" #include "export.h" extern int CONFIG_HISTSYNCER_FREQUENCY; diff --git a/src/zabbix_server/discoverer/discoverer.c b/src/zabbix_server/discoverer/discoverer.c index 173b7864b50..0217be641a2 100644 --- a/src/zabbix_server/discoverer/discoverer.c +++ b/src/zabbix_server/discoverer/discoverer.c @@ -17,11 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "discoverer.h" -#include "db.h" #include "log.h" -#include "sysinfo.h" #include "zbxicmpping.h" #include "discovery.h" #include "zbxserver.h" @@ -29,7 +27,6 @@ #include "zbxrtc.h" #include "daemon.h" -#include "discoverer.h" #include "../poller/checks_agent.h" #include "../poller/checks_snmp.h" #include "zbxcrypto.h" diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c index 411993d7201..488d5ed91eb 100644 --- a/src/zabbix_server/escalator/escalator.c +++ b/src/zabbix_server/escalator/escalator.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" -#include "log.h" +#include "escalator.h" + #include "daemon.h" #include "zbxserver.h" #include "zbxself.h" @@ -27,14 +26,9 @@ #include "../actions.h" #include "../scripts/scripts.h" #include "zbxcrypto.h" -#include "comms.h" #include "../../libs/zbxserver/get_host_from_event.h" #include "../../libs/zbxserver/zabbix_users.h" -#include "zbxservice.h" #include "service_protocol.h" -#include "dbcache.h" - -#include "escalator.h" extern int CONFIG_ESCALATOR_FORKS; diff --git a/src/zabbix_server/events.c b/src/zabbix_server/events.c index 7529772ca09..5fa9b5b4842 100644 --- a/src/zabbix_server/events.c +++ b/src/zabbix_server/events.c @@ -17,15 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" -#include "log.h" +#include "events.h" +#include "log.h" #include "actions.h" -#include "events.h" #include "zbxserver.h" #include "export.h" -#include "zbxservice.h" #include "service_protocol.h" /* event recovery data */ diff --git a/src/zabbix_server/ha/ha.h b/src/zabbix_server/ha/ha.h index b41f59fac25..cc4588becba 100644 --- a/src/zabbix_server/ha/ha.h +++ b/src/zabbix_server/ha/ha.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_HA_H #define ZABBIX_HA_H -#include "common.h" #include "zbxrtc.h" typedef struct diff --git a/src/zabbix_server/ha/ha_manager.c b/src/zabbix_server/ha/ha_manager.c index fba809dc2e8..f47086cfd61 100644 --- a/src/zabbix_server/ha/ha_manager.c +++ b/src/zabbix_server/ha/ha_manager.c @@ -17,19 +17,18 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "ha.h" +#include "zbxha.h" + #include "db.h" -#include "log.h" #include "zbxipcservice.h" #include "zbxserialize.h" #include "threads.h" -#include "zbxjson.h" #include "mutexs.h" #include "../../libs/zbxalgo/vectorimpl.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_ha.h" #include "../../libs/zbxaudit/audit_settings.h" -#include "zbxha.h" -#include "ha.h" #define ZBX_HA_POLL_PERIOD 5 diff --git a/src/zabbix_server/housekeeper/history_compress.c b/src/zabbix_server/housekeeper/history_compress.c index d6ffd525bfc..d21db2ee468 100644 --- a/src/zabbix_server/housekeeper/history_compress.c +++ b/src/zabbix_server/housekeeper/history_compress.c @@ -17,12 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "zbxdb.h" -#include "dbcache.h" -#include "log.h" #include "history_compress.h" +#include "log.h" + #if defined(HAVE_POSTGRESQL) #define ZBX_TS_SEGMENT_BY "itemid" diff --git a/src/zabbix_server/housekeeper/history_compress.h b/src/zabbix_server/housekeeper/history_compress.h index 4721b4fdf6f..c7cd4ba14c9 100644 --- a/src/zabbix_server/housekeeper/history_compress.h +++ b/src/zabbix_server/housekeeper/history_compress.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_HISTORY_COMPRESSION_H #define ZABBIX_HISTORY_COMPRESSION_H +#include "dbcache.h" + void hk_history_compression_init(void); void hk_history_compression_update(zbx_config_db_t *cfg); diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index 59e5303c05e..cb99393cbc0 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -17,21 +17,16 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" -#include "dbcache.h" +#include "housekeeper.h" #include "log.h" #include "daemon.h" #include "zbxself.h" -#include "zbxalgo.h" #include "zbxserver.h" #include "zbxrtc.h" -#include "zbxipcservice.h" #include "history_compress.h" #include "../../libs/zbxdbcache/valuecache.h" -#include "housekeeper.h" extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; diff --git a/src/zabbix_server/housekeeper/trigger_housekeeper.c b/src/zabbix_server/housekeeper/trigger_housekeeper.c index 6a564c8ff4f..68596044815 100644 --- a/src/zabbix_server/housekeeper/trigger_housekeeper.c +++ b/src/zabbix_server/housekeeper/trigger_housekeeper.c @@ -19,12 +19,9 @@ #include "trigger_housekeeper.h" -#include "common.h" #include "log.h" #include "zbxself.h" -#include "zbxservice.h" #include "daemon.h" -#include "zbxalgo.h" #include "service_protocol.h" #include "zbxrtc.h" diff --git a/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c index c3c26089d8b..524b7e7b780 100644 --- a/src/zabbix_server/httppoller/httpmacro.c +++ b/src/zabbix_server/httppoller/httpmacro.c @@ -17,13 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "httpmacro.h" + #include "log.h" #include "zbxregexp.h" #include "zbxhttp.h" -#include "httpmacro.h" - #define REGEXP_PREFIX "regex:" #define REGEXP_PREFIX_SIZE ZBX_CONST_STRLEN(REGEXP_PREFIX) diff --git a/src/zabbix_server/httppoller/httppoller.c b/src/zabbix_server/httppoller/httppoller.c index d0f83f54b1f..8004df11c45 100644 --- a/src/zabbix_server/httppoller/httppoller.c +++ b/src/zabbix_server/httppoller/httppoller.c @@ -17,15 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "httppoller.h" +#include "common.h" #include "db.h" #include "log.h" #include "daemon.h" #include "zbxself.h" - #include "httptest.h" -#include "httppoller.h" extern int CONFIG_HTTPPOLLER_FORKS; extern ZBX_THREAD_LOCAL unsigned char process_type; diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c index 7629789b8ac..b7006a736d0 100644 --- a/src/zabbix_server/httppoller/httptest.c +++ b/src/zabbix_server/httppoller/httptest.c @@ -17,19 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "httptest.h" -#include "db.h" #include "log.h" -#include "dbcache.h" #include "preproc.h" #include "daemon.h" - #include "zbxserver.h" #include "zbxregexp.h" #include "zbxhttp.h" - -#include "httptest.h" #include "httpmacro.h" typedef struct diff --git a/src/zabbix_server/ipmi/ipmi.c b/src/zabbix_server/ipmi/ipmi.c index 6c35fd8d5c7..8d5317f89de 100644 --- a/src/zabbix_server/ipmi/ipmi.c +++ b/src/zabbix_server/ipmi/ipmi.c @@ -17,19 +17,16 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "ipmi.h" #ifdef HAVE_OPENIPMI #include "log.h" -#include "dbcache.h" #include "zbxipcservice.h" #include "ipmi_protocol.h" #include "checks_ipmi.h" #include "zbxserver.h" -#include "ipmi.h" - /****************************************************************************** * * * Purpose: expands user macros in IPMI port value and converts the result to * diff --git a/src/zabbix_server/ipmi/ipmi.h b/src/zabbix_server/ipmi/ipmi.h index fe33a20aaed..2c3db8fd660 100644 --- a/src/zabbix_server/ipmi/ipmi.h +++ b/src/zabbix_server/ipmi/ipmi.h @@ -23,8 +23,12 @@ #include "dbcache.h" #include "zbxtypes.h" +#ifdef HAVE_OPENIPMI + int zbx_ipmi_port_expand_macros(zbx_uint64_t hostid, const char *port_orig, unsigned short *port, char **error); int zbx_ipmi_execute_command(const DC_HOST *host, const char *command, char *error, size_t max_error_len); int zbx_ipmi_test_item(const DC_ITEM *item, char **info); #endif + +#endif diff --git a/src/zabbix_server/ipmi/ipmi_manager.c b/src/zabbix_server/ipmi/ipmi_manager.c index 2141bdefb17..1f8cf3ab1a4 100644 --- a/src/zabbix_server/ipmi/ipmi_manager.c +++ b/src/zabbix_server/ipmi/ipmi_manager.c @@ -21,7 +21,8 @@ #ifdef HAVE_OPENIPMI -#include "dbcache.h" +#include "ipmi_manager.h" + #include "daemon.h" #include "zbxself.h" #include "log.h" @@ -33,8 +34,6 @@ #include "../poller/poller.h" #include "zbxavailability.h" -#include "ipmi_manager.h" - #define ZBX_IPMI_MANAGER_DELAY 1 extern ZBX_THREAD_LOCAL unsigned char process_type; diff --git a/src/zabbix_server/ipmi/ipmi_poller.c b/src/zabbix_server/ipmi/ipmi_poller.c index 2b2df455bdf..36eec2c71b5 100644 --- a/src/zabbix_server/ipmi/ipmi_poller.c +++ b/src/zabbix_server/ipmi/ipmi_poller.c @@ -21,6 +21,8 @@ #ifdef HAVE_OPENIPMI +#include "ipmi_poller.h" + #include "daemon.h" #include "zbxself.h" #include "log.h" @@ -28,7 +30,6 @@ #include "ipmi_protocol.h" #include "checks_ipmi.h" -#include "ipmi_poller.h" #define ZBX_IPMI_MANAGER_CLEANUP_DELAY SEC_PER_DAY diff --git a/src/zabbix_server/ipmi/ipmi_protocol.c b/src/zabbix_server/ipmi/ipmi_protocol.c index 62b9303f321..8c17238f626 100644 --- a/src/zabbix_server/ipmi/ipmi_protocol.c +++ b/src/zabbix_server/ipmi/ipmi_protocol.c @@ -21,10 +21,11 @@ #ifdef HAVE_OPENIPMI +#include "ipmi_protocol.h" + #include "zbxserialize.h" #include "zbxserver.h" -#include "ipmi_protocol.h" zbx_uint32_t zbx_ipmi_serialize_request(unsigned char **data, zbx_uint64_t hostid, zbx_uint64_t objectid, const char *addr, unsigned short port, signed char authtype, unsigned char privilege, diff --git a/src/zabbix_server/lld/lld.c b/src/zabbix_server/lld/lld.c index 6b8d48feab2..6bf5120538e 100644 --- a/src/zabbix_server/lld/lld.c +++ b/src/zabbix_server/lld/lld.c @@ -17,14 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" #include "lld.h" -#include "db.h" +#include "proxy.h" + #include "log.h" -#include "zbxalgo.h" #include "zbxserver.h" #include "zbxregexp.h" -#include "proxy.h" #include "../../libs/zbxaudit/audit.h" diff --git a/src/zabbix_server/lld/lld.h b/src/zabbix_server/lld/lld.h index 71ac0617fd3..9362e99ddb8 100644 --- a/src/zabbix_server/lld/lld.h +++ b/src/zabbix_server/lld/lld.h @@ -22,7 +22,6 @@ #include "common.h" #include "zbxjson.h" -#include "zbxalgo.h" #include "db.h" typedef struct diff --git a/src/zabbix_server/lld/lld_graph.c b/src/zabbix_server/lld/lld_graph.c index 15f57ad257a..824ba85e6ac 100644 --- a/src/zabbix_server/lld/lld_graph.c +++ b/src/zabbix_server/lld/lld_graph.c @@ -17,15 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "db.h" +#include "lld.h" + #include "log.h" -#include "zbxalgo.h" #include "zbxserver.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_graph.h" -#include "lld.h" - typedef struct { zbx_uint64_t graphid; diff --git a/src/zabbix_server/lld/lld_host.c b/src/zabbix_server/lld/lld_host.c index faeb0f5a793..9a41e241385 100644 --- a/src/zabbix_server/lld/lld_host.c +++ b/src/zabbix_server/lld/lld_host.c @@ -17,15 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "db.h" +#include "lld.h" + #include "log.h" -#include "zbxalgo.h" #include "zbxserver.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_host.h" -#include "lld.h" - typedef struct { zbx_uint64_t hostmacroid; diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c index 345cc7911e3..e46e3aa63da 100644 --- a/src/zabbix_server/lld/lld_item.c +++ b/src/zabbix_server/lld/lld_item.c @@ -17,13 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "db.h" +#include "lld.h" + #include "log.h" -#include "zbxalgo.h" #include "zbxserver.h" #include "zbxregexp.h" #include "zbxprometheus.h" -#include "zbxvariant.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_item.h" diff --git a/src/zabbix_server/lld/lld_manager.c b/src/zabbix_server/lld/lld_manager.c index 894661f2931..774c9f7ffac 100644 --- a/src/zabbix_server/lld/lld_manager.c +++ b/src/zabbix_server/lld/lld_manager.c @@ -17,13 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "daemon.h" +#include "lld_manager.h" +#include "daemon.h" #include "zbxself.h" #include "log.h" #include "zbxipcservice.h" -#include "lld_manager.h" #include "lld_protocol.h" extern ZBX_THREAD_LOCAL unsigned char process_type; diff --git a/src/zabbix_server/lld/lld_protocol.c b/src/zabbix_server/lld/lld_protocol.c index b69ff43e4f0..0661f858d5f 100644 --- a/src/zabbix_server/lld/lld_protocol.c +++ b/src/zabbix_server/lld/lld_protocol.c @@ -17,14 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "lld_protocol.h" +#include "zbxlld.h" + #include "log.h" #include "zbxserialize.h" #include "zbxipcservice.h" -#include "lld_protocol.h" #include "sysinfo.h" -#include "zbxlld.h" -#include "lld_manager.h" zbx_uint32_t zbx_lld_serialize_item_value(unsigned char **data, zbx_uint64_t itemid, zbx_uint64_t hostid, const char *value, const zbx_timespec_t *ts, unsigned char meta, zbx_uint64_t lastlogsize, int mtime, diff --git a/src/zabbix_server/lld/lld_trigger.c b/src/zabbix_server/lld/lld_trigger.c index a922f2d8200..245b948d51a 100644 --- a/src/zabbix_server/lld/lld_trigger.c +++ b/src/zabbix_server/lld/lld_trigger.c @@ -17,16 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "db.h" +#include "lld.h" + #include "log.h" -#include "zbxalgo.h" #include "zbxserver.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_trigger.h" -#include "lld.h" - typedef struct { zbx_uint64_t triggerid; diff --git a/src/zabbix_server/lld/lld_worker.c b/src/zabbix_server/lld/lld_worker.c index 076fbf95ed2..55740eae00b 100644 --- a/src/zabbix_server/lld/lld_worker.c +++ b/src/zabbix_server/lld/lld_worker.c @@ -17,17 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "lld_worker.h" + #include "daemon.h" -#include "db.h" #include "log.h" #include "zbxipcservice.h" #include "zbxself.h" -#include "dbcache.h" #include "proxy.h" #include "../events.h" - -#include "lld_worker.h" #include "lld_protocol.h" extern ZBX_THREAD_LOCAL unsigned char process_type; diff --git a/src/zabbix_server/odbc/odbc.c b/src/zabbix_server/odbc/odbc.c index 3cd3b3b0c22..d7e8f08c9d9 100644 --- a/src/zabbix_server/odbc/odbc.c +++ b/src/zabbix_server/odbc/odbc.c @@ -21,10 +21,11 @@ #ifdef HAVE_UNIXODBC +#include "odbc.h" + #include <sql.h> #include <sqlext.h> -#include "odbc.h" #include "log.h" #include "zbxjson.h" #include "zbxalgo.h" diff --git a/src/zabbix_server/odbc/odbc.h b/src/zabbix_server/odbc/odbc.h index db163cb2171..3ecdf461ee2 100644 --- a/src/zabbix_server/odbc/odbc.h +++ b/src/zabbix_server/odbc/odbc.h @@ -20,6 +20,10 @@ #ifndef ZABBIX_ZBXODBC_H #define ZABBIX_ZBXODBC_H +#include "config.h" + +#ifdef HAVE_UNIXODBC + typedef struct zbx_odbc_data_source zbx_odbc_data_source_t; typedef struct zbx_odbc_query_result zbx_odbc_query_result_t; @@ -34,4 +38,6 @@ int zbx_odbc_query_result_to_json(zbx_odbc_query_result_t *query_result, char ** void zbx_odbc_query_result_free(zbx_odbc_query_result_t *query_result); void zbx_odbc_data_source_free(zbx_odbc_data_source_t *data_source); +#endif /* HAVE_UNIXODBC */ + #endif diff --git a/src/zabbix_server/operations.c b/src/zabbix_server/operations.c index 196b7c8b8b5..c4126ee704c 100644 --- a/src/zabbix_server/operations.c +++ b/src/zabbix_server/operations.c @@ -17,16 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "comms.h" -#include "db.h" +#include "operations.h" + #include "log.h" -#include "dbcache.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_host.h" -#include "operations.h" - typedef enum { ZBX_DISCOVERY_UNSPEC = 0, diff --git a/src/zabbix_server/operations.h b/src/zabbix_server/operations.h index 4601b1b1a24..a87831e83a0 100644 --- a/src/zabbix_server/operations.h +++ b/src/zabbix_server/operations.h @@ -20,8 +20,7 @@ #ifndef ZABBIX_OPERATIONS_H #define ZABBIX_OPERATIONS_H -#include "db.h" -#include "zbxalgo.h" +#include "dbcache.h" extern int CONFIG_TIMEOUT; diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c index ff4a6a25a12..500d1929a79 100644 --- a/src/zabbix_server/pinger/pinger.c +++ b/src/zabbix_server/pinger/pinger.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "pinger.h" -#include "dbcache.h" #include "log.h" #include "zbxserver.h" #include "zbxicmpping.h" @@ -27,8 +26,6 @@ #include "zbxself.h" #include "preproc.h" -#include "pinger.h" - /* defines for `fping' and `fping6' to successfully process pings */ #define MIN_COUNT 1 #define MAX_COUNT 10000 diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c index 9961643a42f..803fbc9a219 100644 --- a/src/zabbix_server/poller/checks_agent.c +++ b/src/zabbix_server/poller/checks_agent.c @@ -17,13 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "comms.h" -#include "log.h" -#include "../../libs/zbxcrypto/tls_tcp_active.h" - #include "checks_agent.h" +#include "log.h" + #if !(defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)) extern unsigned char program_type; #endif diff --git a/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c deleted file mode 100644 index 70214a5e629..00000000000 --- a/src/zabbix_server/poller/checks_aggregate.c +++ /dev/null @@ -1,490 +0,0 @@ -/* -** Zabbix -** Copyright (C) 2001-2022 Zabbix SIA -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program 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 General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -**/ - -#include "common.h" -#include "log.h" -#include "valuecache.h" -#include "dbcache.h" - -#include "checks_aggregate.h" - -#define ZBX_VALUE_FUNC_MIN 0 -#define ZBX_VALUE_FUNC_AVG 1 -#define ZBX_VALUE_FUNC_MAX 2 -#define ZBX_VALUE_FUNC_SUM 3 -#define ZBX_VALUE_FUNC_COUNT 4 -#define ZBX_VALUE_FUNC_LAST 5 - -/****************************************************************************** - * * - * Purpose: calculate minimum value from the history value vector * - * * - * Parameters: values - [IN] a vector containing history values * - * value_type - [IN] the type of values. Only float/uint64 * - * values are supported. * - * result - [OUT] the resulting value * - * * - ******************************************************************************/ -static void evaluate_history_func_min(zbx_vector_history_record_t *values, int value_type, history_value_t *result) -{ - int i; - - *result = values->values[0].value; - - if (ITEM_VALUE_TYPE_UINT64 == value_type) - { - for (i = 1; i < values->values_num; i++) - if (values->values[i].value.ui64 < result->ui64) - result->ui64 = values->values[i].value.ui64; - } - else - { - for (i = 1; i < values->values_num; i++) - if (values->values[i].value.dbl < result->dbl) - result->dbl = values->values[i].value.dbl; - } -} - -/****************************************************************************** - * * - * Purpose: calculate maximum value from the history value vector * - * * - * Parameters: values - [IN] a vector containing history values * - * value_type - [IN] the type of values. Only float/uint64 * - * values are supported. * - * result - [OUT] the resulting value * - * * - ******************************************************************************/ -static void evaluate_history_func_max(zbx_vector_history_record_t *values, int value_type, history_value_t *result) -{ - int i; - - *result = values->values[0].value; - - if (ITEM_VALUE_TYPE_UINT64 == value_type) - { - for (i = 1; i < values->values_num; i++) - if (values->values[i].value.ui64 > result->ui64) - result->ui64 = values->values[i].value.ui64; - } - else - { - for (i = 1; i < values->values_num; i++) - if (values->values[i].value.dbl > result->dbl) - result->dbl = values->values[i].value.dbl; - } -} - -/****************************************************************************** - * * - * Purpose: calculate sum of values from the history value vector * - * * - * Parameters: values - [IN] a vector containing history values * - * value_type - [IN] the type of values. Only float/uint64 * - * values are supported. * - * result - [OUT] the resulting value * - * * - ******************************************************************************/ -static void evaluate_history_func_sum(zbx_vector_history_record_t *values, int value_type, history_value_t *result) -{ - int i; - - if (ITEM_VALUE_TYPE_UINT64 == value_type) - { - result->ui64 = 0; - for (i = 0; i < values->values_num; i++) - result->ui64 += values->values[i].value.ui64; - } - else - { - result->dbl = 0; - for (i = 0; i < values->values_num; i++) - result->dbl += values->values[i].value.dbl; - } -} - -/****************************************************************************** - * * - * Purpose: calculate average value of values from the history value vector * - * * - * Parameters: values - [IN] a vector containing history values * - * value_type - [IN] the type of values. Only float/uint64 * - * values are supported. * - * result - [OUT] the resulting value * - * * - ******************************************************************************/ -static void evaluate_history_func_avg(zbx_vector_history_record_t *values, int value_type, history_value_t *result) -{ - evaluate_history_func_sum(values, value_type, result); - - if (ITEM_VALUE_TYPE_UINT64 == value_type) - result->ui64 /= values->values_num; - else - result->dbl /= values->values_num; -} - -/****************************************************************************** - * * - * Purpose: calculate number of values in value vector * - * * - * Parameters: values - [IN] a vector containing history values * - * value_type - [IN] the type of values. Only float/uint64 * - * values are supported. * - * result - [OUT] the resulting value * - * * - ******************************************************************************/ -static void evaluate_history_func_count(zbx_vector_history_record_t *values, int value_type, - history_value_t *result) -{ - if (ITEM_VALUE_TYPE_UINT64 == value_type) - result->ui64 = values->values_num; - else - result->dbl = values->values_num; -} - -/****************************************************************************** - * * - * Purpose: calculate the last (newest) value in value vector * - * * - * Parameters: values - [IN] a vector containing history values * - * result - [OUT] the resulting value * - * * - ******************************************************************************/ -static void evaluate_history_func_last(zbx_vector_history_record_t *values, history_value_t *result) -{ - *result = values->values[0].value; -} - -/****************************************************************************** - * * - * Purpose: calculate function with values from value vector * - * * - * Parameters: values - [IN] a vector containing history values * - * value_type - [IN] the type of values. Only float/uint64 * - * values are supported. * - * func - [IN] the function to calculate. Only * - * ZBX_VALUE_FUNC_MIN, ZBX_VALUE_FUNC_AVG, * - * ZBX_VALUE_FUNC_MAX, ZBX_VALUE_FUNC_SUM, * - * ZBX_VALUE_FUNC_COUNT, ZBX_VALUE_FUNC_LAST * - * functions are supported. * - * result - [OUT] the resulting value * - * * - ******************************************************************************/ -static void evaluate_history_func(zbx_vector_history_record_t *values, int value_type, int func, - history_value_t *result) -{ - switch (func) - { - case ZBX_VALUE_FUNC_MIN: - evaluate_history_func_min(values, value_type, result); - break; - case ZBX_VALUE_FUNC_AVG: - evaluate_history_func_avg(values, value_type, result); - break; - case ZBX_VALUE_FUNC_MAX: - evaluate_history_func_max(values, value_type, result); - break; - case ZBX_VALUE_FUNC_SUM: - evaluate_history_func_sum(values, value_type, result); - break; - case ZBX_VALUE_FUNC_COUNT: - evaluate_history_func_count(values, value_type, result); - break; - case ZBX_VALUE_FUNC_LAST: - evaluate_history_func_last(values, result); - break; - } -} - -/****************************************************************************** - * * - * Purpose: quotes string by enclosing it in double quotes and escaping * - * double quotes inside string with '\'. * - * * - * Parameters: str - [IN/OUT] the string to quote * - * sz_str - [IN] the string length * - * * - * Comments: The '\' character itself is not quoted. As the result if string * - * ends with '\' it can be quoted (for example for error messages), * - * but it's impossible to unquote it. * - * * - ******************************************************************************/ -static void quote_string(char **str, size_t sz_src) -{ - size_t sz_dst; - - sz_dst = zbx_get_escape_string_len(*str, "\"") + 3; - - *str = (char *)zbx_realloc(*str, sz_dst); - - (*str)[--sz_dst] = '\0'; - (*str)[--sz_dst] = '"'; - - while (0 < sz_src) - { - (*str)[--sz_dst] = (*str)[--sz_src]; - - if ('"' == (*str)[sz_src]) - (*str)[--sz_dst] = '\\'; - } - (*str)[--sz_dst] = '"'; -} - -/****************************************************************************** - * * - * Purpose: quotes the individual groups in the list if necessary * - * * - ******************************************************************************/ -static void aggregate_quote_groups(char **str, size_t *str_alloc, size_t *str_offset, zbx_vector_str_t *groups) -{ - int i; - char *group, *separator = ""; - - for (i = 1; i <= groups->values_num; i++) - { - group = zbx_strdup(NULL, groups->values[i - 1]); - zbx_strcpy_alloc(str, str_alloc, str_offset, separator); - separator = (char *)", "; - - quote_string(&group, strlen(group)); - zbx_strcpy_alloc(str, str_alloc, str_offset, group); - zbx_free(group); - } -} - -/****************************************************************************** - * * - * Purpose: get array of items specified by key for selected groups * - * (including nested groups) * - * * - * Parameters: itemids - [OUT] list of item ids * - * groups - [IN] list of host groups * - * itemkey - [IN] item key to aggregate * - * error - [OUT] the error message * - * * - * Return value: SUCCEED - item identifier(s) were retrieved successfully * - * FAIL - no items matching the specified groups or keys * - * * - ******************************************************************************/ -static int aggregate_get_items(zbx_vector_uint64_t *itemids, zbx_vector_str_t *groups, const char *itemkey, - char **error) -{ - char *esc; - DB_RESULT result; - DB_ROW row; - zbx_uint64_t itemid; - char *sql = NULL; - size_t sql_alloc = ZBX_KIBIBYTE, sql_offset = 0, error_alloc = 0, error_offset = 0; - int ret = FAIL; - zbx_vector_uint64_t groupids; - - zabbix_log(LOG_LEVEL_DEBUG, "In %s() itemkey:'%s'", __func__, itemkey); - - zbx_vector_uint64_create(&groupids); - zbx_dc_get_nested_hostgroupids_by_names(groups, &groupids); - - if (0 == groupids.values_num) - { - zbx_strcpy_alloc(error, &error_alloc, &error_offset, "None of the groups in list "); - aggregate_quote_groups(error, &error_alloc, &error_offset, groups); - zbx_strcpy_alloc(error, &error_alloc, &error_offset, " is correct."); - goto out; - } - - sql = (char *)zbx_malloc(sql, sql_alloc); - esc = DBdyn_escape_string(itemkey); - - zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, - "select distinct i.itemid" - " from items i,hosts h,hosts_groups hg,item_rtdata ir" - " where i.hostid=h.hostid" - " and h.hostid=hg.hostid" - " and i.key_='%s'" - " and i.status=%d" - " and ir.itemid=i.itemid" - " and ir.state=%d" - " and h.status=%d" - " and", - esc, ITEM_STATUS_ACTIVE, ITEM_STATE_NORMAL, HOST_STATUS_MONITORED); - - zbx_free(esc); - - DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "hg.groupid", groupids.values, groupids.values_num); - result = DBselect("%s", sql); - zbx_free(sql); - - while (NULL != (row = DBfetch(result))) - { - ZBX_STR2UINT64(itemid, row[0]); - zbx_vector_uint64_append(itemids, itemid); - } - DBfree_result(result); - - if (0 == itemids->values_num) - { - zbx_snprintf_alloc(error, &error_alloc, &error_offset, "No items for key \"%s\" in group(s) ", itemkey); - aggregate_quote_groups(error, &error_alloc, &error_offset, groups); - zbx_chrcpy_alloc(error, &error_alloc, &error_offset, '.'); - goto out; - } - - zbx_vector_uint64_sort(itemids, ZBX_DEFAULT_UINT64_COMPARE_FUNC); - - ret = SUCCEED; - -out: - zbx_vector_uint64_destroy(&groupids); - - zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__); - - return ret; -} - -/****************************************************************************** - * * - * Parameters: item - [IN] aggregated item * - * grp_func - [IN] one of ZBX_GRP_FUNC_* * - * groups - [IN] list of host groups * - * itemkey - [IN] item key to aggregate * - * item_func - [IN] one of ZBX_VALUE_FUNC_* * - * param - [IN] item_func parameter (optional) * - * * - * Return value: SUCCEED - aggregate item evaluated successfully * - * FAIL - otherwise * - * * - ******************************************************************************/ -static int evaluate_aggregate(const DC_ITEM *item, AGENT_RESULT *res, int grp_func, zbx_vector_str_t *groups, - const char *itemkey, int item_func, const char *param) -{ - zbx_vector_uint64_t itemids; - history_value_t value, item_result; - zbx_history_record_t group_value; - int ret = FAIL, *errcodes = NULL, i, count, seconds; - DC_ITEM *items = NULL; - zbx_vector_history_record_t values, group_values; - char *error = NULL; - zbx_timespec_t ts; - - zabbix_log(LOG_LEVEL_DEBUG, "In %s() grp_func:%d itemkey:'%s' item_func:%d param:'%s'", - __func__, grp_func, itemkey, item_func, ZBX_NULL2STR(param)); - - zbx_timespec(&ts); - zbx_vector_uint64_create(&itemids); - - if (FAIL == aggregate_get_items(&itemids, groups, itemkey, &error)) - { - SET_MSG_RESULT(res, error); - goto clean1; - } - - memset(&value, 0, sizeof(value)); - zbx_history_record_vector_create(&group_values); - - items = (DC_ITEM *)zbx_malloc(items, sizeof(DC_ITEM) * itemids.values_num); - errcodes = (int *)zbx_malloc(errcodes, sizeof(int) * itemids.values_num); - - DCconfig_get_items_by_itemids(items, itemids.values, errcodes, itemids.values_num); - - if (ZBX_VALUE_FUNC_LAST == item_func) - { - count = 1; - seconds = 0; - } - else - { - if (FAIL == is_time_suffix(param, &seconds, ZBX_LENGTH_UNLIMITED)) - { - SET_MSG_RESULT(res, zbx_strdup(NULL, "Invalid fourth parameter.")); - goto clean2; - } - count = 0; - } - - for (i = 0; i < itemids.values_num; i++) - { - if (SUCCEED != errcodes[i]) - continue; - - if (ITEM_STATUS_ACTIVE != items[i].status) - continue; - - if (HOST_STATUS_MONITORED != items[i].host.status) - continue; - - if (ITEM_VALUE_TYPE_FLOAT != items[i].value_type && ITEM_VALUE_TYPE_UINT64 != items[i].value_type) - continue; - - zbx_history_record_vector_create(&values); - - if (SUCCEED == zbx_vc_get_values(items[i].itemid, items[i].value_type, &values, seconds, count, &ts) && - 0 < values.values_num) - { - evaluate_history_func(&values, items[i].value_type, item_func, &item_result); - - if (item->value_type == items[i].value_type) - group_value.value = item_result; - else - { - if (ITEM_VALUE_TYPE_UINT64 == item->value_type) - group_value.value.ui64 = (zbx_uint64_t)item_result.dbl; - else - group_value.value.dbl = (double)item_result.ui64; - } - - zbx_vector_history_record_append_ptr(&group_values, &group_value); - } - - zbx_history_record_vector_destroy(&values, items[i].value_type); - } - - zbx_vc_flush_stats(); - - if (0 == group_values.values_num) - { - char *tmp = NULL; - size_t tmp_alloc = 0, tmp_offset = 0; - - aggregate_quote_groups(&tmp, &tmp_alloc, &tmp_offset, groups); - SET_MSG_RESULT(res, zbx_dsprintf(NULL, "No values for key \"%s\" in group(s) %s.", itemkey, tmp)); - zbx_free(tmp); - - goto clean2; - } - - evaluate_history_func(&group_values, item->value_type, grp_func, &value); - - if (ITEM_VALUE_TYPE_FLOAT == item->value_type) - SET_DBL_RESULT(res, value.dbl); - else - SET_UI64_RESULT(res, value.ui64); - - ret = SUCCEED; -clean2: - DCconfig_clean_items(items, errcodes, itemids.values_num); - - zbx_free(errcodes); - zbx_free(items); - zbx_history_record_vector_destroy(&group_values, item->value_type); -clean1: - zbx_vector_uint64_destroy(&itemids); - - zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret)); - - return ret; -} diff --git a/src/zabbix_server/poller/checks_external.c b/src/zabbix_server/poller/checks_external.c index 4646f2b074d..786bcd4dc77 100644 --- a/src/zabbix_server/poller/checks_external.c +++ b/src/zabbix_server/poller/checks_external.c @@ -17,12 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "checks_external.h" + #include "log.h" #include "zbxexec.h" -#include "checks_external.h" - extern char *CONFIG_EXTERNALSCRIPTS; /****************************************************************************** diff --git a/src/zabbix_server/poller/checks_http.h b/src/zabbix_server/poller/checks_http.h index 81ab5fb58db..3e5d392cd23 100644 --- a/src/zabbix_server/poller/checks_http.h +++ b/src/zabbix_server/poller/checks_http.h @@ -20,6 +20,7 @@ #ifndef ZABBIX_CHECKS_HTTP_H #define ZABBIX_CHECKS_HTTP_H +#include "config.h" #include "module.h" #ifdef HAVE_LIBCURL diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c index 5c695492a12..9878bc63430 100644 --- a/src/zabbix_server/poller/checks_internal.c +++ b/src/zabbix_server/poller/checks_internal.c @@ -17,9 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "checks_internal.h" + #include "checks_java.h" -#include "dbcache.h" #include "zbxself.h" #include "preproc.h" #include "zbxtrends.h" @@ -27,8 +27,6 @@ #include "../../libs/zbxserver/zabbix_stats.h" #include "../../libs/zbxsysinfo/common/zabbix_stats.h" -#include "checks_internal.h" - extern unsigned char program_type; static int compare_interfaces(const void *p1, const void *p2) diff --git a/src/zabbix_server/poller/checks_java.c b/src/zabbix_server/poller/checks_java.c index bc57b529814..f7653286ea0 100644 --- a/src/zabbix_server/poller/checks_java.c +++ b/src/zabbix_server/poller/checks_java.c @@ -17,14 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "comms.h" -#include "log.h" +#include "checks_java.h" +#include "log.h" #include "zbxjson.h" -#include "checks_java.h" - static int parse_response(AGENT_RESULT *results, int *errcodes, int num, char *response, char *error, int max_error_len) { diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c index cf1254cd75c..1d71a20b121 100644 --- a/src/zabbix_server/poller/checks_simple.c +++ b/src/zabbix_server/poller/checks_simple.c @@ -17,14 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "checks_simple.h" + #include "checks_simple_vmware.h" #include "simple.h" #include "log.h" #include "zbxself.h" -#include "checks_simple.h" - typedef int (*vmfunc_t)(AGENT_REQUEST *, const char *, const char *, AGENT_RESULT *); #define ZBX_VMWARE_PREFIX "vmware." diff --git a/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c index 507da6896f5..b370f5f8acd 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.c +++ b/src/zabbix_server/poller/checks_simple_vmware.c @@ -17,14 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "checks_simple_vmware.h" #if defined(HAVE_LIBXML2) && defined(HAVE_LIBCURL) #include "log.h" #include "zbxjson.h" -#include "zbxalgo.h" -#include "checks_simple_vmware.h" #include"../vmware/vmware.h" #define ZBX_VMWARE_DATASTORE_SIZE_TOTAL 0 diff --git a/src/zabbix_server/poller/checks_simple_vmware.h b/src/zabbix_server/poller/checks_simple_vmware.h index 5aa579bc9a6..28251e0a39e 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.h +++ b/src/zabbix_server/poller/checks_simple_vmware.h @@ -17,6 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "config.h" + #ifndef ZABBIX_CHECKS_SIMPLE_VMWARE_H #define ZABBIX_CHECKS_SIMPLE_VMWARE_H diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c index e00b6c4a60f..ee9048b22e5 100644 --- a/src/zabbix_server/poller/poller.c +++ b/src/zabbix_server/poller/poller.c @@ -17,18 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "poller.h" -#include "db.h" -#include "dbcache.h" #include "daemon.h" #include "zbxserver.h" #include "zbxself.h" #include "preproc.h" #include "zbxrtc.h" -#include "poller.h" - #include "checks_agent.h" #include "checks_external.h" #include "checks_internal.h" diff --git a/src/zabbix_server/poller/poller.h b/src/zabbix_server/poller/poller.h index 1391b3f8b9d..13fd88ac474 100644 --- a/src/zabbix_server/poller/poller.h +++ b/src/zabbix_server/poller/poller.h @@ -21,6 +21,7 @@ #define ZABBIX_POLLER_H #include "threads.h" +#include "dbcache.h" extern int CONFIG_TIMEOUT; extern int CONFIG_UNAVAILABLE_DELAY; diff --git a/src/zabbix_server/postinit.c b/src/zabbix_server/postinit.c index ac6f39fddcd..18e84d7fa13 100644 --- a/src/zabbix_server/postinit.c +++ b/src/zabbix_server/postinit.c @@ -17,12 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" +#include "postinit.h" + #include "zbxtasks.h" #include "log.h" #include "zbxserver.h" -#include "postinit.h" #define ZBX_HIST_MACRO_NONE (-1) #define ZBX_HIST_MACRO_ITEM_VALUE 0 diff --git a/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c index 29b5c858c2d..2748cade102 100644 --- a/src/zabbix_server/preprocessor/item_preproc.c +++ b/src/zabbix_server/preprocessor/item_preproc.c @@ -17,6 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "item_preproc.h" + #include "zbxregexp.h" #include "log.h" #include "zbxembed.h" @@ -25,14 +27,11 @@ /* LIBXML2 is used */ #ifdef HAVE_LIBXML2 # include <libxml/parser.h> -# include <libxml/tree.h> # include <libxml/xpath.h> #endif #include "preproc_history.h" -#include "item_preproc.h" - extern zbx_es_t es_engine; /****************************************************************************** * * diff --git a/src/zabbix_server/preprocessor/preproc_history.c b/src/zabbix_server/preprocessor/preproc_history.c index 5e1ee222f7f..8c0c735fed7 100644 --- a/src/zabbix_server/preprocessor/preproc_history.c +++ b/src/zabbix_server/preprocessor/preproc_history.c @@ -17,8 +17,6 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" - #include "preproc_history.h" void zbx_preproc_op_history_free(zbx_preproc_op_history_t *ophistory) diff --git a/src/zabbix_server/preprocessor/preproc_manager.c b/src/zabbix_server/preprocessor/preproc_manager.c index 26b5a06b335..19f21b5c3f5 100644 --- a/src/zabbix_server/preprocessor/preproc_manager.c +++ b/src/zabbix_server/preprocessor/preproc_manager.c @@ -17,20 +17,15 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "dbcache.h" +#include "preproc_manager.h" + #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "sysinfo.h" -#include "zbxipcservice.h" #include "zbxlld.h" #include "preprocessing.h" -#include "zbxalgo.h" #include "preproc_history.h" -#include "preproc_manager.h" - extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; extern ZBX_THREAD_LOCAL int server_num, process_num; diff --git a/src/zabbix_server/preprocessor/preproc_worker.c b/src/zabbix_server/preprocessor/preproc_worker.c index c43d37f27ca..96edee89e0a 100644 --- a/src/zabbix_server/preprocessor/preproc_worker.c +++ b/src/zabbix_server/preprocessor/preproc_worker.c @@ -17,6 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "preproc_worker.h" + #include "common.h" #include "daemon.h" #include "zbxself.h" @@ -27,8 +29,6 @@ #include "item_preproc.h" #include "preproc_history.h" -#include "preproc_worker.h" - extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; extern ZBX_THREAD_LOCAL int server_num, process_num; diff --git a/src/zabbix_server/preprocessor/preprocessing.c b/src/zabbix_server/preprocessor/preprocessing.c index 0df990d4c8f..c7a0a841b46 100644 --- a/src/zabbix_server/preprocessor/preprocessing.c +++ b/src/zabbix_server/preprocessor/preprocessing.c @@ -17,17 +17,15 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "preprocessing.h" + #include "common.h" #include "log.h" #include "zbxserialize.h" -#include "zbxipcservice.h" -#include "preproc.h" #include "preproc_history.h" #include "item_preproc.h" #include "../../libs/zbxalgo/vectorimpl.h" -#include "preprocessing.h" - #define PACKED_FIELD_RAW 0 #define PACKED_FIELD_STRING 1 #define MAX_VALUES_LOCAL 256 diff --git a/src/zabbix_server/preprocessor/preprocessing.h b/src/zabbix_server/preprocessor/preprocessing.h index 6cd5f875912..c8a0b5dc637 100644 --- a/src/zabbix_server/preprocessor/preprocessing.h +++ b/src/zabbix_server/preprocessor/preprocessing.h @@ -20,11 +20,7 @@ #ifndef ZABBIX_PREPROCESSING_H #define ZABBIX_PREPROCESSING_H -#include "common.h" -#include "module.h" -#include "dbcache.h" #include "preproc.h" -#include "zbxalgo.h" #include "zbxipcservice.h" #define ZBX_IPC_SERVICE_PREPROCESSING "preprocessing" diff --git a/src/zabbix_server/proxypoller/proxypoller.c b/src/zabbix_server/proxypoller/proxypoller.c index 158cf729c95..dc4ce3d07a3 100644 --- a/src/zabbix_server/proxypoller/proxypoller.c +++ b/src/zabbix_server/proxypoller/proxypoller.c @@ -17,16 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "proxypoller.h" + #include "common.h" #include "daemon.h" -#include "comms.h" #include "zbxself.h" - -#include "proxypoller.h" #include "zbxserver.h" -#include "dbcache.h" #include "db.h" -#include "zbxjson.h" #include "log.h" #include "proxy.h" #include "zbxcrypto.h" diff --git a/src/zabbix_server/reporter/report_manager.c b/src/zabbix_server/reporter/report_manager.c index b4a18cb7ba5..833ac1a6cad 100644 --- a/src/zabbix_server/reporter/report_manager.c +++ b/src/zabbix_server/reporter/report_manager.c @@ -17,16 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "log.h" +#include "report_manager.h" + #include "zbxself.h" -#include "zbxipcservice.h" #include "daemon.h" -#include "db.h" -#include "zbxjson.h" #include "base64.h" -#include "zbxalgo.h" -#include "dbcache.h" #include "zbxreport.h" #include "../../libs/zbxcrypto/hmac_sha256.h" #include "sha256crypt.h" @@ -35,8 +30,6 @@ #include "zbxserver.h" #include "report_protocol.h" -#include "report_manager.h" - #define ZBX_REPORT_INCLUDE_USER 0 #define ZBX_REPORT_EXCLUDE_USER 1 diff --git a/src/zabbix_server/reporter/report_manager.h b/src/zabbix_server/reporter/report_manager.h index 8378d626d94..007911957be 100644 --- a/src/zabbix_server/reporter/report_manager.h +++ b/src/zabbix_server/reporter/report_manager.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_REPORT_MANAGER_H #define ZABBIX_REPORT_MANAGER_H -#include "common.h" #include "threads.h" ZBX_THREAD_ENTRY(report_manager_thread, args); diff --git a/src/zabbix_server/reporter/report_protocol.c b/src/zabbix_server/reporter/report_protocol.c index 9d3448c07ab..9d1443c07a5 100644 --- a/src/zabbix_server/reporter/report_protocol.c +++ b/src/zabbix_server/reporter/report_protocol.c @@ -17,16 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" #include "zbxreport.h" -#include "zbxipcservice.h" +#include "report_protocol.h" + #include "zbxserialize.h" -#include "zbxalgo.h" -#include "db.h" #include "zbxalert.h" -#include "report_protocol.h" - static int json_uint_by_tag(const struct zbx_json_parse *jp, const char *tag, zbx_uint64_t *value, char **error) { char buf[MAX_ID_LEN + 1]; diff --git a/src/zabbix_server/reporter/report_writer.c b/src/zabbix_server/reporter/report_writer.c index 1781e8f9e2b..1de9efdc81d 100644 --- a/src/zabbix_server/reporter/report_writer.c +++ b/src/zabbix_server/reporter/report_writer.c @@ -17,18 +17,15 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "report_writer.h" + #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "zbxipcservice.h" #include "zbxjson.h" #include "zbxalert.h" -#include "db.h" #include "report_protocol.h" -#include "report_writer.h" - extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; extern ZBX_THREAD_LOCAL int server_num, process_num; diff --git a/src/zabbix_server/scripts/scripts.c b/src/zabbix_server/scripts/scripts.c index 2cc27242b0f..8dcd7112708 100644 --- a/src/zabbix_server/scripts/scripts.c +++ b/src/zabbix_server/scripts/scripts.c @@ -17,7 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "scripts.h" + #include "../poller/checks_agent.h" #include "../ipmi/ipmi.h" #include "../poller/checks_ssh.h" @@ -27,11 +28,8 @@ #include "db.h" #include "log.h" #include "zbxtasks.h" -#include "zbxjson.h" #include "zbxembed.h" -#include "scripts.h" - extern int CONFIG_TRAPPER_TIMEOUT; extern int CONFIG_IPMIPOLLER_FORKS; diff --git a/src/zabbix_server/scripts/scripts.h b/src/zabbix_server/scripts/scripts.h index 89b0bdc0850..344fb37335d 100644 --- a/src/zabbix_server/scripts/scripts.h +++ b/src/zabbix_server/scripts/scripts.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_SCRIPTS_H #define ZABBIX_SCRIPTS_H -#include "common.h" #include "dbcache.h" void zbx_script_init(zbx_script_t *script); diff --git a/src/zabbix_server/selfmon/selfmon.c b/src/zabbix_server/selfmon/selfmon.c index b94a7e6db48..bc38d6d32db 100644 --- a/src/zabbix_server/selfmon/selfmon.c +++ b/src/zabbix_server/selfmon/selfmon.c @@ -17,11 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "selfmon.h" + #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "selfmon.h" extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 3af95894e3a..a156c93b8ed 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -17,29 +17,24 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "config.h" #ifdef HAVE_SQLITE3 # error SQLite is not supported as a main Zabbix database backend. #endif +#include "export.h" +#include "zbxself.h" +#include "sighandler.h" + #include "cfg.h" -#include "pid.h" -#include "db.h" -#include "dbcache.h" #include "zbxdbupgrade.h" #include "log.h" #include "zbxgetopt.h" #include "mutexs.h" - -#include "sysinfo.h" #include "zbxmodules.h" -#include "zbxserver.h" - #include "zbxnix.h" #include "daemon.h" -#include "zbxself.h" -#include "../libs/zbxnix/control.h" #include "alerter/alerter.h" #include "alerter/alert_manager.h" @@ -74,11 +69,9 @@ #include "zbxcrypto.h" #include "zbxhistory.h" #include "postinit.h" -#include "export.h" #include "zbxvault.h" #include "zbxtrends.h" #include "ha/ha.h" -#include "sighandler.h" #include "zbxrtc.h" #include "zbxha.h" diff --git a/src/zabbix_server/service/service_actions.c b/src/zabbix_server/service/service_actions.c index c6d4cf42fe0..e035edcc4ad 100644 --- a/src/zabbix_server/service/service_actions.c +++ b/src/zabbix_server/service/service_actions.c @@ -17,10 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "log.h" #include "service_actions.h" +#include "log.h" + /****************************************************************************** * * * Purpose: match service update by service id * diff --git a/src/zabbix_server/service/service_actions.h b/src/zabbix_server/service/service_actions.h index 60b765b5ea2..87188895bff 100644 --- a/src/zabbix_server/service/service_actions.h +++ b/src/zabbix_server/service/service_actions.h @@ -17,7 +17,6 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxalgo.h" #include "service_manager_impl.h" #ifndef ZABBIX_SERVICE_ACTIONS_H diff --git a/src/zabbix_server/service/service_manager.c b/src/zabbix_server/service/service_manager.c index 64d3b26081c..2398f82f0e4 100644 --- a/src/zabbix_server/service/service_manager.c +++ b/src/zabbix_server/service/service_manager.c @@ -17,19 +17,15 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "service_manager.h" + #include "log.h" #include "zbxself.h" -#include "zbxservice.h" -#include "zbxipcservice.h" #include "daemon.h" -#include "sighandler.h" -#include "zbxalgo.h" #include "service_protocol.h" #include "service_actions.h" #include "zbxserialize.h" -#include "service_manager.h" - extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; extern ZBX_THREAD_LOCAL int server_num, process_num; diff --git a/src/zabbix_server/service/service_manager.h b/src/zabbix_server/service/service_manager.h index fd5bfc64ee2..c68bfef0fec 100644 --- a/src/zabbix_server/service/service_manager.h +++ b/src/zabbix_server/service/service_manager.h @@ -20,7 +20,6 @@ #ifndef ZABBIX_SERVICE_MANAGER_H #define ZABBIX_SERVICE_MANAGER_H -#include "common.h" #include "threads.h" ZBX_THREAD_ENTRY(service_manager_thread, args); diff --git a/src/zabbix_server/service/service_manager_impl.h b/src/zabbix_server/service/service_manager_impl.h index c40d5d4625f..32ea413b7b6 100644 --- a/src/zabbix_server/service/service_manager_impl.h +++ b/src/zabbix_server/service/service_manager_impl.h @@ -17,7 +17,6 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" #include "zbxalgo.h" #ifndef ZABBIX_SERVICE_MANAGER_IMPL_H diff --git a/src/zabbix_server/snmptrapper/snmptrapper.c b/src/zabbix_server/snmptrapper/snmptrapper.c index 8b90f0f5fef..d5d3aebbc89 100644 --- a/src/zabbix_server/snmptrapper/snmptrapper.c +++ b/src/zabbix_server/snmptrapper/snmptrapper.c @@ -17,13 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "dbcache.h" +#include "snmptrapper.h" + #include "zbxself.h" #include "daemon.h" #include "log.h" #include "proxy.h" -#include "snmptrapper.h" #include "zbxserver.h" #include "zbxregexp.h" #include "preproc.h" diff --git a/src/zabbix_server/taskmanager/taskmanager.c b/src/zabbix_server/taskmanager/taskmanager.c index e9ab72f8db2..5d6a97c8fbb 100644 --- a/src/zabbix_server/taskmanager/taskmanager.c +++ b/src/zabbix_server/taskmanager/taskmanager.c @@ -17,17 +17,16 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "taskmanager.h" + #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "db.h" #include "dbcache.h" #include "zbxtasks.h" #include "../events.h" #include "../actions.h" #include "export.h" -#include "taskmanager.h" #include "zbxdiag.h" #include "service_protocol.h" diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index d0d79fad0b5..aec1e485f6a 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -17,14 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "timer.h" + #include "log.h" #include "dbcache.h" #include "daemon.h" #include "zbxself.h" -#include "db.h" - -#include "timer.h" #define ZBX_TIMER_DELAY SEC_PER_MIN diff --git a/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c index ca6a685e14b..1af6c35243a 100644 --- a/src/zabbix_server/trapper/active.c +++ b/src/zabbix_server/trapper/active.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "db.h" -#include "dbcache.h" +#include "active.h" + #include "log.h" #include "zbxserver.h" #include "zbxregexp.h" @@ -27,8 +26,6 @@ #include "../../libs/zbxcrypto/tls_tcp_active.h" -#include "active.h" - extern unsigned char program_type; /****************************************************************************** diff --git a/src/zabbix_server/trapper/nodecommand.c b/src/zabbix_server/trapper/nodecommand.c index 18a7c92b635..291a2c3f808 100644 --- a/src/zabbix_server/trapper/nodecommand.c +++ b/src/zabbix_server/trapper/nodecommand.c @@ -17,20 +17,17 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "comms.h" +#include "nodecommand.h" + #include "zbxserver.h" -#include "db.h" #include "log.h" +#include "trapper_auth.h" + #include "../scripts/scripts.h" #include "../../libs/zbxaudit/audit.h" - -#include "trapper_auth.h" #include "../../libs/zbxserver/get_host_from_event.h" #include "../../libs/zbxserver/zabbix_users.h" -#include "nodecommand.h" - /****************************************************************************** * * * Purpose: execute remote command and wait for the result * diff --git a/src/zabbix_server/trapper/proxyconfig.c b/src/zabbix_server/trapper/proxyconfig.c index 32d7b94754f..61a8c7c545c 100644 --- a/src/zabbix_server/trapper/proxyconfig.c +++ b/src/zabbix_server/trapper/proxyconfig.c @@ -17,17 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "proxyconfig.h" + #include "db.h" #include "log.h" #include "proxy.h" #include "zbxrtc.h" -#include "../../libs/zbxcrypto/tls_tcp_active.h" #include "zbxcompress.h" -#include "zbxipcservice.h" - -#include "proxyconfig.h" /****************************************************************************** * * diff --git a/src/zabbix_server/trapper/proxydata.c b/src/zabbix_server/trapper/proxydata.c index 2870fce2283..f9d5f6be361 100644 --- a/src/zabbix_server/trapper/proxydata.c +++ b/src/zabbix_server/trapper/proxydata.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "proxydata.h" #include "db.h" #include "log.h" #include "proxy.h" @@ -27,7 +27,6 @@ #include "daemon.h" #include "zbxcompress.h" -#include "proxydata.h" extern unsigned char program_type; static zbx_mutex_t proxy_lock = ZBX_MUTEX_NULL; diff --git a/src/zabbix_server/trapper/proxydata.h b/src/zabbix_server/trapper/proxydata.h index 62f927d01d6..bb7a821dd17 100644 --- a/src/zabbix_server/trapper/proxydata.h +++ b/src/zabbix_server/trapper/proxydata.h @@ -20,8 +20,8 @@ #ifndef ZABBIX_PROXYDATA_H #define ZABBIX_PROXYDATA_H -#include "comms.h" #include "zbxjson.h" +#include "dbcache.h" extern int CONFIG_TIMEOUT; extern int CONFIG_TRAPPER_TIMEOUT; diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index bd905a52565..669365ba018 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -17,24 +17,19 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "trapper.h" #include "log.h" -#include "zbxjson.h" -#include "dbcache.h" #include "proxy.h" #include "zbxself.h" - #include "active.h" #include "nodecommand.h" #include "proxyconfig.h" #include "proxydata.h" - #include "daemon.h" #include "zbxcrypto.h" #include "../../libs/zbxserver/zabbix_stats.h" #include "../poller/checks_snmp.h" - #include "trapper_auth.h" #include "trapper_preproc.h" #include "trapper_expressions_evaluate.h" @@ -45,8 +40,6 @@ # include "zbxrtc.h" #endif -#include "trapper.h" - #define ZBX_MAX_SECTION_ENTRIES 4 #define ZBX_MAX_ENTRY_ATTRIBUTES 3 diff --git a/src/zabbix_server/trapper/trapper_auth.c b/src/zabbix_server/trapper/trapper_auth.c index 525ea88311a..300752f7721 100644 --- a/src/zabbix_server/trapper/trapper_auth.c +++ b/src/zabbix_server/trapper/trapper_auth.c @@ -17,14 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "trapper_auth.h" + #include <string.h> -#include "common.h" #include "db.h" #include "log.h" #include "sha512crypt.h" -#include "zbxjson.h" - -#include "trapper_auth.h" /****************************************************************************** * * diff --git a/src/zabbix_server/trapper/trapper_expressions_evaluate.c b/src/zabbix_server/trapper/trapper_expressions_evaluate.c index 62bf00540e7..505f6ecb861 100644 --- a/src/zabbix_server/trapper/trapper_expressions_evaluate.c +++ b/src/zabbix_server/trapper/trapper_expressions_evaluate.c @@ -17,12 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "trapper_expressions_evaluate.h" + #include "zbxalgo.h" #include "dbcache.h" - #include "trapper_auth.h" -#include "trapper_expressions_evaluate.h" static int trapper_parse_expressions_evaluate(const struct zbx_json_parse *jp, zbx_vector_ptr_t *expressions, char **error) diff --git a/src/zabbix_server/trapper/trapper_item_test.c b/src/zabbix_server/trapper/trapper_item_test.c index 002448e4202..a5adfc0d840 100644 --- a/src/zabbix_server/trapper/trapper_item_test.c +++ b/src/zabbix_server/trapper/trapper_item_test.c @@ -17,9 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "trapper_item_test.h" + #include "log.h" -#include "zbxjson.h" -#include "dbcache.h" #include "zbxserver.h" #include "../poller/poller.h" #include "zbxtasks.h" @@ -28,7 +28,6 @@ #endif #include "trapper_auth.h" -#include "trapper_item_test.h" static void dump_item(const DC_ITEM *item) { diff --git a/src/zabbix_server/trapper/trapper_preproc.c b/src/zabbix_server/trapper/trapper_preproc.c index b71e096df82..c4af0bc9513 100644 --- a/src/zabbix_server/trapper/trapper_preproc.c +++ b/src/zabbix_server/trapper/trapper_preproc.c @@ -17,14 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "zbxjson.h" -#include "zbxalgo.h" +#include "trapper_preproc.h" + #include "preproc.h" #include "../preprocessor/preproc_history.h" - #include "trapper_auth.h" -#include "trapper_preproc.h" #define ZBX_STATE_NOT_SUPPORTED 1 diff --git a/src/zabbix_server/trapper/trapper_proxy.c b/src/zabbix_server/trapper/trapper_proxy.c index aeac4a55d07..2f5a0cb3183 100644 --- a/src/zabbix_server/trapper/trapper_proxy.c +++ b/src/zabbix_server/trapper/trapper_proxy.c @@ -17,9 +17,6 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -#include "comms.h" -#include "zbxjson.h" #include "trapper_request.h" int trapper_process_request(const char *request, zbx_socket_t *sock, const struct zbx_json_parse *jp) diff --git a/src/zabbix_server/trapper/trapper_server.c b/src/zabbix_server/trapper/trapper_server.c index 826558e36dd..a73c2228f61 100644 --- a/src/zabbix_server/trapper/trapper_server.c +++ b/src/zabbix_server/trapper/trapper_server.c @@ -17,19 +17,16 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "trapper_request.h" + #include "log.h" #include "cfg.h" -#include "comms.h" #include "trapper_auth.h" #include "zbxreport.h" -#include "zbxjson.h" #include "db.h" #include "../alerter/alerter_protocol.h" #include "zbxipcservice.h" -#include "trapper_request.h" - extern int CONFIG_REPORTMANAGER_FORKS; static void trapper_process_report_test(zbx_socket_t *sock, const struct zbx_json_parse *jp) diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c index 8d8a6276e19..8dcc9d5a18f 100644 --- a/src/zabbix_server/vmware/vmware.c +++ b/src/zabbix_server/vmware/vmware.c @@ -24,7 +24,6 @@ /* LIBXML2 is used */ #ifdef HAVE_LIBXML2 # include <libxml/parser.h> -# include <libxml/tree.h> # include <libxml/xpath.h> #endif diff --git a/src/zabbix_server/vmware/vmware.h b/src/zabbix_server/vmware/vmware.h index c3dd6f82aea..26d43a3e265 100644 --- a/src/zabbix_server/vmware/vmware.h +++ b/src/zabbix_server/vmware/vmware.h @@ -20,7 +20,6 @@ #define ZABBIX_VMWARE_H #include "config.h" -#include "zbxtypes.h" #include "threads.h" #include "zbxalgo.h" |