diff options
| author | Andris Mednis <Andris.Mednis@zabbix.com> | 2015-05-05 15:39:48 +0300 |
|---|---|---|
| committer | Andris Mednis <Andris.Mednis@zabbix.com> | 2015-05-05 15:39:48 +0300 |
| commit | 4c2c8aa15db9d1424877e16197f8b27fa09f0d31 (patch) | |
| tree | c1f6afcff13085bff2e5666d260073f348a90ce2 /src/zabbix_agent/listener.c | |
| parent | 063da1dca4887556b0dd0cffdca0425683a706cf (diff) | |
| parent | 649f51eb7849cde726f4957fb25ab14d2313f890 (diff) | |
.......... [ZBXNEXT-1263] updated to the latest trunk
Diffstat (limited to 'src/zabbix_agent/listener.c')
| -rw-r--r-- | src/zabbix_agent/listener.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c index 3bf6e191cf9..efa801fff70 100644 --- a/src/zabbix_agent/listener.c +++ b/src/zabbix_agent/listener.c @@ -39,7 +39,7 @@ extern int server_num, process_num; #include "../libs/zbxcrypto/tls.h" -static void process_listener(zbx_sock_t *s) +static void process_listener(zbx_socket_t *s) { AGENT_RESULT result; char **value = NULL; @@ -89,13 +89,13 @@ static void process_listener(zbx_sock_t *s) } if (FAIL == ret) - zabbix_log(LOG_LEVEL_DEBUG, "Process listener error: %s", zbx_tcp_strerror()); + zabbix_log(LOG_LEVEL_DEBUG, "Process listener error: %s", zbx_socket_strerror()); } ZBX_THREAD_ENTRY(listener_thread, args) { int ret, local_request_failed = 0; - zbx_sock_t s; + zbx_socket_t s; assert(args); assert(((zbx_thread_args_t *)args)->args); @@ -107,7 +107,7 @@ ZBX_THREAD_ENTRY(listener_thread, args) zabbix_log(LOG_LEVEL_INFORMATION, "%s #%d started [%s #%d]", get_program_type_string(program_type), server_num, get_process_type_string(process_type), process_num); - memcpy(&s, (zbx_sock_t *)((zbx_thread_args_t *)args)->args, sizeof(zbx_sock_t)); + memcpy(&s, (zbx_socket_t *)((zbx_thread_args_t *)args)->args, sizeof(zbx_socket_t)); zbx_free(args); @@ -130,10 +130,10 @@ ZBX_THREAD_ENTRY(listener_thread, args) zbx_tcp_unaccept(&s); } - if (SUCCEED == ret || EINTR == zbx_sock_last_error()) + if (SUCCEED == ret || EINTR == zbx_socket_last_error()) continue; - zabbix_log(LOG_LEVEL_WARNING, "failed to accept an incoming connection: %s", zbx_tcp_strerror()); + zabbix_log(LOG_LEVEL_WARNING, "failed to accept an incoming connection: %s", zbx_socket_strerror()); if (local_request_failed++ > 1000) { |