--- Mixtur_Zabbix_Base/src/libs/zbxsysinfo/common/net.c 2010-06-15 13:05:44.000000000 -0700 +++ Mixtur_Zabbix/core_patches/src/libs/zbxsysinfo/common/net.c 2010-06-13 23:48:26.000000000 -0700 @@ -36,7 +36,7 @@ const char *request, const char *expect, const char *sendtoclose, - int *value_int + int *value_int ) { zbx_sock_t s; @@ -48,12 +48,12 @@ *value_int = 0; if (SUCCEED == (ret = zbx_tcp_connect(&s, CONFIG_SOURCE_IP, host, port, 3/*alarm!!!*/))) { - if( NULL == request ) - { - *value_int = 1; + + if( NULL != request ) { + ret = zbx_tcp_send_raw(&s, request); } - else if( SUCCEED == (ret = zbx_tcp_send_raw(&s, request)) ) - { + + if( SUCCEED == ret ) { if( NULL == expect ) { *value_int = 1; @@ -65,11 +65,11 @@ *value_int = 1; } } + } - if(SUCCEED == ret && NULL != sendtoclose) - { - /* ret = (skip errors) */ zbx_tcp_send_raw(&s, sendtoclose); - } + if(SUCCEED == ret && NULL != sendtoclose) + { + /* ret = (skip errors) */ zbx_tcp_send_raw(&s, sendtoclose); } } zbx_tcp_close(&s);