diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-14 10:48:19 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-14 10:48:19 +0000 |
| commit | 8364852d881235d647b4a8cb1df0dfef515a429a (patch) | |
| tree | 979e7bdfd30db4e3e80b6d070896aec237203615 /src/libs/zbxsysinfo/common/net.c | |
| parent | 3f4975b42affe14f0951f500835dfd3da69eb5ce (diff) | |
| download | zabbix-8364852d881235d647b4a8cb1df0dfef515a429a.tar.gz zabbix-8364852d881235d647b4a8cb1df0dfef515a429a.tar.xz zabbix-8364852d881235d647b4a8cb1df0dfef515a429a.zip | |
some quick fixes of protocol
git-svn-id: svn://svn.zabbix.com/trunk@4006 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/common/net.c')
| -rw-r--r-- | src/libs/zbxsysinfo/common/net.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c index b4bcfc5f..c8ffabd5 100644 --- a/src/libs/zbxsysinfo/common/net.c +++ b/src/libs/zbxsysinfo/common/net.c @@ -49,21 +49,22 @@ int tcp_expect( if( SUCCEED == (ret = zbx_tcp_connect(&s, host, port)) ) { - if( SUCCEED == (ret = zbx_tcp_send_raw(&s, request)) ) + if( NULL == request ) { - if( NULL != expect ) + *value_int = 1; + } + else if( SUCCEED == (ret = zbx_tcp_send_raw(&s, request)) ) + { + if( NULL == expect ) { - if( SUCCEED == (ret = zbx_tcp_recv(&s, &buf)) ) - { - if( 0 == strncmp(buf, expect, strlen(expect)) ) - { - *value_int = 1; - } - } + *value_int = 1; } - else + else if( SUCCEED == (ret = zbx_tcp_recv(&s, &buf)) ) { - *value_int = 1; + if( 0 == strncmp(buf, expect, strlen(expect)) ) + { + *value_int = 1; + } } if(SUCCEED == ret && NULL != sendtoclose) @@ -184,8 +185,6 @@ int CHECK_PORT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT int CHECK_DNS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) { -#ifdef TODO - #if !defined(PACKETSZ) # define PACKETSZ 512 #endif /* PACKETSZ */ @@ -254,7 +253,4 @@ int CHECK_DNS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT * SET_UI64_RESULT(result, res != -1 ? 1 : 0); return SYSINFO_RET_OK; - -#endif /* TODO */ - return SYSINFO_RET_FAIL; } |