summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-03-17 09:48:50 +0000
committersasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-03-17 09:48:50 +0000
commitc7c237b363c3a625905fb7bb57ed5df6cb175e89 (patch)
tree92e07d4d60572e49b98903b2de21033c7147ff2b /src
parent9417f34c9d651b2a6d650fae428e825735b7cac0 (diff)
downloadzabbix-c7c237b363c3a625905fb7bb57ed5df6cb175e89.tar.gz
zabbix-c7c237b363c3a625905fb7bb57ed5df6cb175e89.tar.xz
zabbix-c7c237b363c3a625905fb7bb57ed5df6cb175e89.zip
- [DEV-16] Support of IPv6
[svn merge svn://svn.zabbix.com/branches/1.4 -r5457:5496] git-svn-id: svn://svn.zabbix.com/trunk@5497 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
-rw-r--r--src/libs/zbxcomms/comms.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c
index a5cf56e9..94479bbe 100644
--- a/src/libs/zbxcomms/comms.c
+++ b/src/libs/zbxcomms/comms.c
@@ -703,7 +703,7 @@ int zbx_tcp_accept(zbx_sock_t *s)
for(i = 0; i < s->num_socks; i++) {
#if !defined(_WINDOWS)
if(s->sockets[i] > n)
- n = s->sockets[i] + 1;
+ n = s->sockets[i];
#endif
if(FD_ISSET(s->sockets[i], &sock_set))
break;
@@ -712,7 +712,7 @@ int zbx_tcp_accept(zbx_sock_t *s)
if(i == s->num_socks) {
for (i = 0; i < s->num_socks; i++)
FD_SET(s->sockets[i], &sock_set);
- if(select(n, &sock_set, 0, 0, 0) == ZBX_TCP_ERROR) {
+ if(select(n + 1, &sock_set, 0, 0, 0) == ZBX_TCP_ERROR) {
zbx_set_tcp_strerror("select() failed with error %d: %s", zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
return FAIL;
}