(ModbusSlave): добавил вывод в vmonit информации host:port setbug #9012

conf/libuniset2.spec

@@ -13,7 +13,7 @@
 
 Name: libuniset2
 Version: 2.2
-Release: alt21
+Release: alt22
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -451,6 +451,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Tue Feb 09 2016 Pavel Vainerman <pv@altlinux.ru> 2.2-alt22
+- ModbusSlave(TCP): add show ip:port to vmonit setbug #9012
+
 * Sat Feb 06 2016 Pavel Vainerman <pv@altlinux.ru> 2.2-alt21
 - RRDServer: fixed bug in write sequence to rrd base
 

extensions/ModbusSlave/MBSlave.cc

@@ -2391,13 +2391,30 @@ UniSetTypes::SimpleInfo* MBSlave::getInfo( CORBA::Long userparam )
 {
 	UniSetTypes::SimpleInfo_var i = UniSetObject::getInfo(userparam);
 
+	auto sslot = dynamic_pointer_cast<ModbusTCPServerSlot>(mbslot);
+
+
 	ostringstream inf;
 
 	inf << i->info << endl;
+
+	if( sslot ) // т.е. если у нас tcp
+	{
+		ost::InetAddress iaddr = sslot->getInetAddress();
+		inf << "TCPModbusSlave: " << iaddr << endl;
+	}
+
 	inf << vmon.pretty_str() << endl;
+
 	inf << "LogServer:  " << logserv_host << ":" << logserv_port << endl;
 	inf << "iomap=" << iomap.size() << " myaddr: " << ModbusServer::vaddr2str(vaddr) << endl;
 	inf << "Statistic: askCount=" << askCount << " pingOK=" << pingOK << endl;
+	if( sslot ) // т.е. если у нас tcp
+	{
+		ost::InetAddress iaddr = sslot->getInetAddress();
+		inf << "TCP: " << iaddr << ":" << sslot->getInetPort() << endl;
+	}
+
 
 	i->info = inf.str().c_str();
 	return i._retn();

include/modbus/ModbusTCPServer.h

@@ -78,6 +78,9 @@ class ModbusTCPServer:
 
 		void getSessions( Sessions& lst );
 
+		inline ost::InetAddress getInetAddress(){ return iaddr; }
+		inline ost::tpport_t getInetPort(){ return port; }
+
 	protected:
 
 		virtual ModbusRTU::mbErrCode pre_send_request( ModbusRTU::ModbusMessage& request ) override;

src/Communications/Modbus/ModbusTCPServer.cc

@@ -8,8 +8,9 @@ using namespace std;
 using namespace ModbusRTU;
 using namespace UniSetTypes;
 // -------------------------------------------------------------------------
-ModbusTCPServer::ModbusTCPServer( ost::InetAddress& ia, int port ):
-	TCPSocket(ia, port),
+ModbusTCPServer::ModbusTCPServer( ost::InetAddress& ia, int _port ):
+	TCPSocket(ia, _port),
+	port(_port),
 	iaddr(ia),
 	ignoreAddr(false),
 	maxSessions(10),