(ModbusMaster): исправление "ошибки" с нестабильностью связи и периодическим

conf/libuniset.spec

@@ -8,7 +8,7 @@
 
 Name: libuniset
 Version: 1.8
-Release: alt5
+Release: alt6
 Summary: UniSet - library for building distributed industrial control systems
 
 License: GPL
@@ -339,6 +339,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 
 
 %changelog
+* Wed May 13 2015 Pavel Vainerman <pv@altlinux.ru> 1.8-alt6
+- ModbusMaster: fixed bug: unstable timeout...( thank`s ilyap@etersoft.ru)
+
 * Thu Mar 19 2015 Pavel Vainerman <pv@altlinux.ru> 1.8-alt5
 - unetudp: fxied critial bug in "switching channels" (thank`s Alexey Surov)
 

src/Communications/Modbus/ModbusTCPMaster.cc

@@ -197,9 +197,17 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
 			}
 			//
 
-			// timeout = ptTimeout.getLeft(timeout);
-			// в tcp ответе задержек уже не должно быть..
-			mbErrCode res = recv(addr,msg.func,reply,1); //timeout);
+			timeout = ptTimeout.getLeft(timeout);
+			if( timeout <=0 )
+			{
+
+				if( dlog.debugging(Debug::WARN) )
+					dlog[Debug::WARN] << "(ModbusTCPMaster::query): processing reply timeout.." << endl;
+
+				return erTimeOut; // return erHardwareError;
+			}
+
+			mbErrCode res = recv(addr, msg.func, reply, timeout);
 			
 			if( force_disconnect )
 			{