From c4fba54c60efee12f44fe0ed512c7407a34b24a5 Mon Sep 17 00:00:00 2001 From: Artjoms Rimdjonoks Date: Fri, 7 Jan 2022 10:46:30 +0200 Subject: .......... [DEV-2053] restored some includes --- src/libs/zbxalgo/serialize.c | 4 ++-- src/libs/zbxcompress/compress.c | 2 +- src/libs/zbxcrypto/base64.c | 2 +- src/libs/zbxdbupgrade/dbupgrade.c | 3 +-- src/libs/zbxdbupgrade/dbupgrade_2020.c | 2 +- src/libs/zbxeval/calc.c | 2 +- src/libs/zbxeval/parse.c | 2 +- src/libs/zbxhttp/punycode.c | 2 +- src/libs/zbxhttp/urlencode.c | 2 +- src/libs/zbxmedia/sms.c | 2 +- src/libs/zbxnix/coredump.c | 2 +- src/libs/zbxrtc/rtc_client.c | 2 +- src/libs/zbxrtc/rtc_proxy.c | 2 +- src/libs/zbxrtc/rtc_server.c | 2 +- src/libs/zbxserver/zabbix_stats_proxy.c | 2 +- src/libs/zbxserver/zabbix_stats_server.c | 2 +- src/libs/zbxsysinfo/agent/modbus.c | 2 +- src/libs/zbxsysinfo/freebsd/net.c | 2 +- src/libs/zbxsysinfo/osf/cpu.c | 2 +- src/libs/zbxsysinfo/osf/memory.c | 2 +- src/libs/zbxsysinfo/osx/net.c | 2 +- src/zabbix_proxy/proxy_lld.c | 2 +- src/zabbix_server/lld/lld.c | 2 +- src/zabbix_server/lld/lld_protocol.c | 2 +- src/zabbix_server/poller/checks_internal_proxy.c | 2 +- src/zabbix_server/poller/checks_internal_server.c | 2 +- src/zabbix_server/reporter/report_protocol.c | 2 +- tests/libs/zbxtrends/zbx_baseline_get_data.c | 2 ++ tests/zabbix_server/service/mock_service.c | 12 ++++++++++++ tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c | 2 ++ 30 files changed, 44 insertions(+), 29 deletions(-) diff --git a/src/libs/zbxalgo/serialize.c b/src/libs/zbxalgo/serialize.c index 71ed45e374b..e38a38a5915 100644 --- a/src/libs/zbxalgo/serialize.c +++ b/src/libs/zbxalgo/serialize.c @@ -19,8 +19,8 @@ #include "string.h" #include "zbxtypes.h" -/* #include "common.h" -#include "zbxserialize.h" */ +/* #include "common.h"*/ +#include "zbxserialize.h" /****************************************************************************** * * * Function: zbx_serialize_uint31_compact * diff --git a/src/libs/zbxcompress/compress.c b/src/libs/zbxcompress/compress.c index ba88736dd53..c2118f57d83 100644 --- a/src/libs/zbxcompress/compress.c +++ b/src/libs/zbxcompress/compress.c @@ -22,7 +22,7 @@ #include "log.h" //#include //#include "log.h" -//#include "zbxcompress.h" +#include "zbxcompress.h" #ifdef HAVE_ZLIB #include "zlib.h" diff --git a/src/libs/zbxcrypto/base64.c b/src/libs/zbxcrypto/base64.c index 949951e3b19..aaea02504f0 100644 --- a/src/libs/zbxcrypto/base64.c +++ b/src/libs/zbxcrypto/base64.c @@ -18,7 +18,7 @@ **/ #include "common.h" -//#include "base64.h" +#include "base64.h" /****************************************************************************** * * diff --git a/src/libs/zbxdbupgrade/dbupgrade.c b/src/libs/zbxdbupgrade/dbupgrade.c index 9238a51c08c..70e022fc2e1 100644 --- a/src/libs/zbxdbupgrade/dbupgrade.c +++ b/src/libs/zbxdbupgrade/dbupgrade.c @@ -18,11 +18,10 @@ **/ #include "common.h" - #include "db.h" #include "log.h" //#include "sysinfo.h" -//#include "zbxdbupgrade.h" +#include "zbxdbupgrade.h" #include "dbupgrade.h" typedef struct diff --git a/src/libs/zbxdbupgrade/dbupgrade_2020.c b/src/libs/zbxdbupgrade/dbupgrade_2020.c index 8a88f6cb91b..b5833b83536 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2020.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2020.c @@ -18,7 +18,7 @@ **/ #include "common.h" -#include "db.h" +/* #include "db.h"*/ #include "dbupgrade.h" /* diff --git a/src/libs/zbxeval/calc.c b/src/libs/zbxeval/calc.c index 1d348c4cc00..95d1cfb7fc8 100644 --- a/src/libs/zbxeval/calc.c +++ b/src/libs/zbxeval/calc.c @@ -19,7 +19,7 @@ #include "common.h" #include "zbxalgo.h" -//#include "zbxeval.h" +#include "zbxeval.h" //#include "log.h" #include "../../libs/zbxalgo/vectorimpl.h" diff --git a/src/libs/zbxeval/parse.c b/src/libs/zbxeval/parse.c index 4da9969ce0a..1cae9a3b454 100644 --- a/src/libs/zbxeval/parse.c +++ b/src/libs/zbxeval/parse.c @@ -25,7 +25,7 @@ #include "zbxvariant.h" //#include "zbxserialize.h" //#include "zbxserver.h" -//#include "eval.h" +#include "eval.h" #include "zbxeval.h" ZBX_VECTOR_IMPL(eval_token, zbx_eval_token_t) diff --git a/src/libs/zbxhttp/punycode.c b/src/libs/zbxhttp/punycode.c index 20c824e85c1..2eac47bba05 100644 --- a/src/libs/zbxhttp/punycode.c +++ b/src/libs/zbxhttp/punycode.c @@ -19,7 +19,7 @@ #include "common.h" #include "punycode.h" -//#include "zbxhttp.h" +#include "zbxhttp.h" /****************************************************************************** * * diff --git a/src/libs/zbxhttp/urlencode.c b/src/libs/zbxhttp/urlencode.c index f4ede1c2298..e583ad53365 100644 --- a/src/libs/zbxhttp/urlencode.c +++ b/src/libs/zbxhttp/urlencode.c @@ -19,7 +19,7 @@ #include "common.h" #include "log.h" -//#include "zbxhttp.h" +#include "zbxhttp.h" /****************************************************************************** * * diff --git a/src/libs/zbxmedia/sms.c b/src/libs/zbxmedia/sms.c index aa5da2db1d3..dff1335216e 100644 --- a/src/libs/zbxmedia/sms.c +++ b/src/libs/zbxmedia/sms.c @@ -20,7 +20,7 @@ #include "common.h" #include "log.h" -//#include "zbxmedia.h" +#include "zbxmedia.h" #include diff --git a/src/libs/zbxnix/coredump.c b/src/libs/zbxnix/coredump.c index 65e16a7fb51..50a0349c4f3 100644 --- a/src/libs/zbxnix/coredump.c +++ b/src/libs/zbxnix/coredump.c @@ -19,7 +19,7 @@ #include "common.h" #include "log.h" -//#include "zbxnix.h" +#include "zbxnix.h" #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) /****************************************************************************** diff --git a/src/libs/zbxrtc/rtc_client.c b/src/libs/zbxrtc/rtc_client.c index 3eab0fd7d4a..f5c6a698539 100644 --- a/src/libs/zbxrtc/rtc_client.c +++ b/src/libs/zbxrtc/rtc_client.c @@ -19,7 +19,7 @@ #include "zbxipcservice.h" #include "zbxjson.h" -//#include "zbxrtc.h" +#include "zbxrtc.h" #include "rtc.h" extern int CONFIG_TIMEOUT; diff --git a/src/libs/zbxrtc/rtc_proxy.c b/src/libs/zbxrtc/rtc_proxy.c index 28df99e6f31..7f4c42c1165 100644 --- a/src/libs/zbxrtc/rtc_proxy.c +++ b/src/libs/zbxrtc/rtc_proxy.c @@ -19,7 +19,7 @@ //#include "zbxipcservice.h" //#include "zbxrtc.h" -//#include "rtc.h" +#include "rtc.h" #include "zbxtypes.h" #include "proxy.h" diff --git a/src/libs/zbxrtc/rtc_server.c b/src/libs/zbxrtc/rtc_server.c index 7a556ed6575..39c9c4053e8 100644 --- a/src/libs/zbxrtc/rtc_server.c +++ b/src/libs/zbxrtc/rtc_server.c @@ -23,7 +23,7 @@ #include "zbxjson.h" #include "zbxha.h" //#include "zbxrtc.h" -//#include "rtc.h" +#include "rtc.h" #include "zbxtypes.h" #include "common.h" #include "daemon.h" diff --git a/src/libs/zbxserver/zabbix_stats_proxy.c b/src/libs/zbxserver/zabbix_stats_proxy.c index d0910f69a2a..8422af873d1 100644 --- a/src/libs/zbxserver/zabbix_stats_proxy.c +++ b/src/libs/zbxserver/zabbix_stats_proxy.c @@ -19,7 +19,7 @@ #include "common.h" #include "zbxjson.h" -//#include "zabbix_stats.h" +#include "zabbix_stats.h" /****************************************************************************** * * diff --git a/src/libs/zbxserver/zabbix_stats_server.c b/src/libs/zbxserver/zabbix_stats_server.c index 90d617c362b..357324acf01 100644 --- a/src/libs/zbxserver/zabbix_stats_server.c +++ b/src/libs/zbxserver/zabbix_stats_server.c @@ -27,7 +27,7 @@ #include "zbxtrends.h" #include "zbxha.h" -//#include "zabbix_stats.h" +#include "zabbix_stats.h" /****************************************************************************** * * diff --git a/src/libs/zbxsysinfo/agent/modbus.c b/src/libs/zbxsysinfo/agent/modbus.c index 3b79033af91..d0a52c5e040 100644 --- a/src/libs/zbxsysinfo/agent/modbus.c +++ b/src/libs/zbxsysinfo/agent/modbus.c @@ -18,7 +18,7 @@ **/ #include "common.h" -//#include "modbtype.h" +#include "modbtype.h" //#include "mutexs.h" //#include "comms.h" diff --git a/src/libs/zbxsysinfo/freebsd/net.c b/src/libs/zbxsysinfo/freebsd/net.c index fd639855167..a3b06d5fb9e 100644 --- a/src/libs/zbxsysinfo/freebsd/net.c +++ b/src/libs/zbxsysinfo/freebsd/net.c @@ -19,7 +19,7 @@ #include "common.h" #include "sysinfo.h" -#include "../common/common.h" +#include "../common/zbxsysinfo_common.h" #include "zbxjson.h" #include "log.h" diff --git a/src/libs/zbxsysinfo/osf/cpu.c b/src/libs/zbxsysinfo/osf/cpu.c index 7168b7978db..bf40039027a 100644 --- a/src/libs/zbxsysinfo/osf/cpu.c +++ b/src/libs/zbxsysinfo/osf/cpu.c @@ -19,7 +19,7 @@ #include "common.h" #include "sysinfo.h" -#include "../common/common.h" +#include "../common/zbxsysinfo_common.h" int SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result) { diff --git a/src/libs/zbxsysinfo/osf/memory.c b/src/libs/zbxsysinfo/osf/memory.c index 2758ac89cf0..8cf23f6c3e1 100644 --- a/src/libs/zbxsysinfo/osf/memory.c +++ b/src/libs/zbxsysinfo/osf/memory.c @@ -19,7 +19,7 @@ #include "common.h" #include "sysinfo.h" -#include "../common/common.h" +#include "../common/zbxsysinfo_common.h" static int VM_MEMORY_TOTAL(AGENT_RESULT *result) { diff --git a/src/libs/zbxsysinfo/osx/net.c b/src/libs/zbxsysinfo/osx/net.c index 14f8968a926..a0839a5a0f5 100644 --- a/src/libs/zbxsysinfo/osx/net.c +++ b/src/libs/zbxsysinfo/osx/net.c @@ -19,7 +19,7 @@ #include "common.h" #include "sysinfo.h" -#include "../common/common.h" +#include "../common/zbxsysinfo_common.h" #include "log.h" static struct ifmibdata ifmd; diff --git a/src/zabbix_proxy/proxy_lld.c b/src/zabbix_proxy/proxy_lld.c index fbd6f5ca959..14205f6d5d5 100644 --- a/src/zabbix_proxy/proxy_lld.c +++ b/src/zabbix_proxy/proxy_lld.c @@ -20,7 +20,7 @@ #include "common.h" #include "module.h" //#include "sysinfo.h" -//#include "zbxlld.h" +#include "zbxlld.h" void zbx_lld_process_agent_result(zbx_uint64_t itemid, zbx_uint64_t hostid, AGENT_RESULT *result, zbx_timespec_t *ts, char *error) { diff --git a/src/zabbix_server/lld/lld.c b/src/zabbix_server/lld/lld.c index c8f9cdc2575..b5995300683 100644 --- a/src/zabbix_server/lld/lld.c +++ b/src/zabbix_server/lld/lld.c @@ -24,7 +24,7 @@ #include "zbxalgo.h" #include "zbxserver.h" #include "zbxregexp.h" -//#include "proxy.h" +#include "proxy.h" #include "../../libs/zbxaudit/audit.h" diff --git a/src/zabbix_server/lld/lld_protocol.c b/src/zabbix_server/lld/lld_protocol.c index 5ad51526071..71d79029204 100644 --- a/src/zabbix_server/lld/lld_protocol.c +++ b/src/zabbix_server/lld/lld_protocol.c @@ -23,7 +23,7 @@ #include "zbxipcservice.h" #include "lld_protocol.h" #include "sysinfo.h" -//#include "zbxlld.h" +#include "zbxlld.h" #include "lld_manager.h" /****************************************************************************** diff --git a/src/zabbix_server/poller/checks_internal_proxy.c b/src/zabbix_server/poller/checks_internal_proxy.c index 4344bf9f422..fedb1d900fa 100644 --- a/src/zabbix_server/poller/checks_internal_proxy.c +++ b/src/zabbix_server/poller/checks_internal_proxy.c @@ -19,7 +19,7 @@ #include "common.h" #include "proxy.h" -//#include "checks_internal.h" +#include "checks_internal.h" /****************************************************************************** * * diff --git a/src/zabbix_server/poller/checks_internal_server.c b/src/zabbix_server/poller/checks_internal_server.c index d36267c2c84..1d1070dd0bd 100644 --- a/src/zabbix_server/poller/checks_internal_server.c +++ b/src/zabbix_server/poller/checks_internal_server.c @@ -21,7 +21,7 @@ #include "valuecache.h" //#include "preproc.h" #include "zbxlld.h" -//#include "checks_internal.h" +#include "checks_internal.h" #include "dbcache.h" #include "zbxha.h" diff --git a/src/zabbix_server/reporter/report_protocol.c b/src/zabbix_server/reporter/report_protocol.c index b319684ddf5..e205efd33c5 100644 --- a/src/zabbix_server/reporter/report_protocol.c +++ b/src/zabbix_server/reporter/report_protocol.c @@ -18,7 +18,7 @@ **/ #include "common.h" -//#include "zbxreport.h" +#include "zbxreport.h" #include "report_protocol.h" #include "zbxipcservice.h" #include "zbxserialize.h" diff --git a/tests/libs/zbxtrends/zbx_baseline_get_data.c b/tests/libs/zbxtrends/zbx_baseline_get_data.c index e9d500e01f8..71910809f69 100644 --- a/tests/libs/zbxtrends/zbx_baseline_get_data.c +++ b/tests/libs/zbxtrends/zbx_baseline_get_data.c @@ -29,6 +29,8 @@ int __wrap_DBis_null(const char *field); DB_ROW __wrap_DBfetch(DB_RESULT result); DB_RESULT __wrap_DBselect(const char *fmt, ...); +zbx_trend_state_t __wrap_zbx_trends_get_avg(const char *table, zbx_uint64_t itemid, int start, int end, + double *value); int __wrap_DBis_null(const char *field) { diff --git a/tests/zabbix_server/service/mock_service.c b/tests/zabbix_server/service/mock_service.c index 2156986b8b5..3caeaf73186 100644 --- a/tests/zabbix_server/service/mock_service.c +++ b/tests/zabbix_server/service/mock_service.c @@ -26,6 +26,18 @@ #include "mock_service.h" +zbx_uint64_t __wrap_DCget_nextid(const char *table_name, int num); +void *__wrap_zbx_add_event(unsigned char source, unsigned char object, zbx_uint64_t objectid, + const zbx_timespec_t *timespec, int value, const char *trigger_description, + const char *trigger_expression, const char *trigger_recovery_expression, unsigned char trigger_priority, + unsigned char trigger_type, const zbx_vector_ptr_t *trigger_tags, + unsigned char trigger_correlation_mode, const char *trigger_correlation_tag, + unsigned char trigger_value, const char *trigger_opdata, const char *event_name, const char *error); +int __wrap_zbx_process_events(zbx_vector_ptr_t *trigger_diff, zbx_vector_uint64_t *triggerids_lock); +void __wrap_zbx_clean_events(void); +int __wrap_zbx_interface_availability_is_set(const void *ia); + + /* stubs to satisfy hard link dependenceies */ int get_process_info_by_thread(int local_server_num, unsigned char *local_process_type, int *local_process_num); diff --git a/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c b/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c index c7ea2dac668..79a5bcafa8c 100644 --- a/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c +++ b/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c @@ -38,6 +38,8 @@ int __wrap_DBget_user_by_active_session(const char *sessionid, zbx_user_t *user) int __wrap_DBget_user_by_auth_token(const char *formatted_auth_token_hash, zbx_user_t *user); void __wrap_zbx_user_init(zbx_user_t *user); void __wrap_zbx_user_free(zbx_user_t *user); +void __wrap_init_result(AGENT_RESULT *result); +void __wrap_free_result(AGENT_RESULT *result); int __wrap_zbx_preprocessor_test(unsigned char value_type, const char *value, const zbx_timespec_t *ts, const zbx_vector_ptr_t *steps, zbx_vector_ptr_t *results, zbx_vector_ptr_t *history, -- cgit v1.2.3