diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-10 15:53:34 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-10 15:53:34 +0000 |
| commit | e14b3e34e93567f331b1669f79ba74c63be223d1 (patch) | |
| tree | 9fd7843664d3c1be12055b2bd192a7bd2a1775b7 /src/libs/zbxsysinfo/simple | |
| parent | e486dc3d851b74b984c3433deaff836e69ea7507 (diff) | |
| download | zabbix-e14b3e34e93567f331b1669f79ba74c63be223d1.tar.gz zabbix-e14b3e34e93567f331b1669f79ba74c63be223d1.tar.xz zabbix-e14b3e34e93567f331b1669f79ba74c63be223d1.zip | |
- [ZBX-192] Data collection stopped after connexion loss
[svn merge -r5147:5153 svn://svn.zabbix.com/branches/1.4]
git-svn-id: svn://svn.zabbix.com/trunk@5155 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/simple')
| -rw-r--r-- | src/libs/zbxsysinfo/simple/ntp.c | 5 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/simple/simple.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/libs/zbxsysinfo/simple/ntp.c b/src/libs/zbxsysinfo/simple/ntp.c index 7af7e920..55c227a8 100644 --- a/src/libs/zbxsysinfo/simple/ntp.c +++ b/src/libs/zbxsysinfo/simple/ntp.c @@ -190,8 +190,7 @@ int check_ntp(char *host, unsigned short port, int *value_int) *value_int = 0; - if( SUCCEED == (ret = zbx_tcp_connect(&s, host, port)) ) - { + if (SUCCEED == (ret = zbx_tcp_connect(&s, host, port, 0))) { make_packet(&data); pack_ntp((unsigned char*)packet, sizeof(packet), &data); @@ -201,7 +200,7 @@ int check_ntp(char *host, unsigned short port, int *value_int) if( SUCCEED == (ret = zbx_tcp_recv(&s, &buf)) ) { - unpack_ntp(&data, (unsigned char *)buf, strlen(buf)); + unpack_ntp(&data, (unsigned char *)buf, (int)strlen(buf)); #if OFF /* local time */ *value_int = time(NULL); diff --git a/src/libs/zbxsysinfo/simple/simple.c b/src/libs/zbxsysinfo/simple/simple.c index 28a04f04..03bb05f7 100644 --- a/src/libs/zbxsysinfo/simple/simple.c +++ b/src/libs/zbxsysinfo/simple/simple.c @@ -118,9 +118,7 @@ static int check_ssh(const char *host, unsigned short port, int *value_int) assert(value_int); *value_int = 0; - - if( SUCCEED == (ret = zbx_tcp_connect(&s, host, port)) ) - { + if (SUCCEED == (ret = zbx_tcp_connect(&s, host, port, 0))) { if( SUCCEED == (ret = zbx_tcp_recv(&s, &recv_buf)) ) { if ( 0 == strncmp(recv_buf, "SSH", 3) ) |