diff options
| -rw-r--r-- | include/comms.h | 2 | ||||
| -rw-r--r-- | src/libs/zbxcommshigh/comms.c | 13 | ||||
| -rw-r--r-- | src/zabbix_agent/active.c | 4 | ||||
| -rw-r--r-- | src/zabbix_proxy/datasender/datasender.c | 4 | ||||
| -rw-r--r-- | src/zabbix_proxy/heart/heart.c | 3 | ||||
| -rw-r--r-- | src/zabbix_proxy/proxyconfig/proxyconfig.c | 2 | ||||
| -rw-r--r-- | src/zabbix_sender/zabbix_sender.c | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/include/comms.h b/include/comms.h index 3af5480ebd5..7a923e0ed2d 100644 --- a/include/comms.h +++ b/include/comms.h @@ -200,7 +200,7 @@ int zbx_send_response_ext(zbx_socket_t *sock, int result, const char *info, cons int zbx_recv_response(zbx_socket_t *sock, int timeout, char **error); int connect_to_server(zbx_socket_t *sock, const char *source_ip, zbx_vector_ptr_t *addrs, int timeout, - unsigned int tls_connect, int retry_interval); + int connect_timeout, unsigned int tls_connect, int retry_interval); void disconnect_server(zbx_socket_t *sock); int get_data_from_server(zbx_socket_t *sock, char **buffer, size_t buffer_size, size_t reserved, char **error); diff --git a/src/libs/zbxcommshigh/comms.c b/src/libs/zbxcommshigh/comms.c index 35838ae8e07..e7ff7a7344b 100644 --- a/src/libs/zbxcommshigh/comms.c +++ b/src/libs/zbxcommshigh/comms.c @@ -69,14 +69,14 @@ static int zbx_tcp_connect_failover(zbx_socket_t *s, const char *source_ip, zbx_ } int connect_to_server(zbx_socket_t *sock, const char *source_ip, zbx_vector_ptr_t *addrs, int timeout, - unsigned int tls_connect, int retry_interval) + int connect_timeout, unsigned int tls_connect, int retry_interval) { int res, lastlogtime, now; char *tls_arg1, *tls_arg2; zabbix_log(LOG_LEVEL_DEBUG, "In connect_to_server() [%s]:%d [timeout:%d, connection timeout:%d]", ((zbx_addr_t *)addrs->values[0])->ip, ((zbx_addr_t *)addrs->values[0])->port, timeout, - CONFIG_TIMEOUT); + connect_timeout); switch (tls_connect) { @@ -99,8 +99,8 @@ int connect_to_server(zbx_socket_t *sock, const char *source_ip, zbx_vector_ptr_ return FAIL; } - if (FAIL == (res = zbx_tcp_connect_failover(sock, source_ip, addrs, timeout, CONFIG_TIMEOUT, - tls_connect, tls_arg1, tls_arg2))) + if (FAIL == (res = zbx_tcp_connect_failover(sock, source_ip, addrs, timeout, connect_timeout, tls_connect, + tls_arg1, tls_arg2))) { if (0 != retry_interval) { @@ -110,9 +110,8 @@ int connect_to_server(zbx_socket_t *sock, const char *source_ip, zbx_vector_ptr_ lastlogtime = (int)time(NULL); - while (ZBX_IS_RUNNING() && FAIL == (res = zbx_tcp_connect_failover(sock, source_ip, - addrs, timeout, CONFIG_TIMEOUT, tls_connect, tls_arg1, - tls_arg2))) + while (ZBX_IS_RUNNING() && FAIL == (res = zbx_tcp_connect_failover(sock, source_ip, addrs, + timeout, connect_timeout, tls_connect, tls_arg1, tls_arg2))) { now = (int)time(NULL); diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index f364dd68cdd..738fae1fa5d 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -606,7 +606,7 @@ static int refresh_active_checks(zbx_vector_ptr_t *addrs) if (ZBX_DEFAULT_AGENT_PORT != CONFIG_LISTEN_PORT) zbx_json_adduint64(&json, ZBX_PROTO_TAG_PORT, CONFIG_LISTEN_PORT); - if (SUCCEED == (ret = connect_to_server(&s, CONFIG_SOURCE_IP, addrs, CONFIG_TIMEOUT, + if (SUCCEED == (ret = connect_to_server(&s, CONFIG_SOURCE_IP, addrs, CONFIG_TIMEOUT, CONFIG_TIMEOUT, configured_tls_connect_mode, 0))) { zabbix_log(LOG_LEVEL_DEBUG, "sending [%s]", json.buffer); @@ -783,7 +783,7 @@ static int send_buffer(zbx_vector_ptr_t *addrs) zbx_json_close(&json); if (SUCCEED == (ret = connect_to_server(&s, CONFIG_SOURCE_IP, addrs, MIN(buffer.count * CONFIG_TIMEOUT, 60), - configured_tls_connect_mode, 0))) + CONFIG_TIMEOUT, configured_tls_connect_mode, 0))) { zbx_timespec(&ts); zbx_json_adduint64(&json, ZBX_PROTO_TAG_CLOCK, ts.sec); diff --git a/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c index 1f212902fe8..2fe99736d45 100644 --- a/src/zabbix_proxy/datasender/datasender.c +++ b/src/zabbix_proxy/datasender/datasender.c @@ -188,8 +188,8 @@ static int proxy_data_sender(int *more, int now, int *hist_upload_state) zbx_json_free(&j); /* json buffer can be large, free as fast as possible */ /* retry till have a connection */ - if (FAIL == connect_to_server(&sock, CONFIG_SOURCE_IP, &zbx_addrs, 600, configured_tls_connect_mode, - CONFIG_PROXYDATA_FREQUENCY)) + if (FAIL == connect_to_server(&sock, CONFIG_SOURCE_IP, &zbx_addrs, 600, CONFIG_TIMEOUT, + configured_tls_connect_mode, CONFIG_PROXYDATA_FREQUENCY)) { goto clean; } diff --git a/src/zabbix_proxy/heart/heart.c b/src/zabbix_proxy/heart/heart.c index 78d532db9cc..c161842cca9 100644 --- a/src/zabbix_proxy/heart/heart.c +++ b/src/zabbix_proxy/heart/heart.c @@ -47,6 +47,7 @@ static int send_heartbeat(void) extern zbx_vector_ptr_t zbx_addrs; extern char *CONFIG_HOSTNAME; extern char *CONFIG_SOURCE_IP; + extern int CONFIG_TIMEOUT; extern unsigned int configured_tls_connect_mode; zabbix_log(LOG_LEVEL_DEBUG, "In send_heartbeat()"); @@ -65,7 +66,7 @@ static int send_heartbeat(void) reserved = j.buffer_size; if (FAIL == (ret = connect_to_server(&sock, CONFIG_SOURCE_IP, &zbx_addrs, CONFIG_HEARTBEAT_FREQUENCY, - configured_tls_connect_mode, 0))) /* do not retry */ + CONFIG_TIMEOUT, configured_tls_connect_mode, 0))) /* do not retry */ { goto clean; } diff --git a/src/zabbix_proxy/proxyconfig/proxyconfig.c b/src/zabbix_proxy/proxyconfig/proxyconfig.c index f04c41ee635..d5f81b2151c 100644 --- a/src/zabbix_proxy/proxyconfig/proxyconfig.c +++ b/src/zabbix_proxy/proxyconfig/proxyconfig.c @@ -85,7 +85,7 @@ static void process_configuration_sync(size_t *data_size) zbx_json_free(&j); if (FAIL == connect_to_server(&sock,CONFIG_SOURCE_IP, &zbx_addrs, 600, configured_tls_connect_mode, - CONFIG_PROXYCONFIG_RETRY)) /* retry till have a connection */ + CONFIG_TIMEOUT, CONFIG_PROXYCONFIG_RETRY)) /* retry till have a connection */ { goto out; } diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index d2186ae1546..76515cf13d3 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -673,7 +673,7 @@ static ZBX_THREAD_ENTRY(send_value, args) } #endif if (SUCCEED == (tcp_ret = connect_to_server(&sock, CONFIG_SOURCE_IP, sendval_args->addrs, - CONFIG_SENDER_TIMEOUT, configured_tls_connect_mode, 0))) + CONFIG_SENDER_TIMEOUT, CONFIG_TIMEOUT, configured_tls_connect_mode, 0))) { if (1 == sendval_args->sync_timestamp) { |