(UNetUDP): небольшие исправления, а так же подправил формат вывода

conf/libuniset2.spec

@@ -13,7 +13,7 @@
 
 Name: libuniset2
 Version: 2.1
-Release: alt15
+Release: alt15.1
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -456,6 +456,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Thu Aug 13 2015 Pavel Vainerman <pv@etersoft.ru> 2.1-alt15.1
+- test build for new UNetUDP
+
 * Wed Aug 12 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt15
 - (Modbus): add new property "pollfactor" (see docs)
 

extensions/UNetUDP/UNetExchange.cc

@@ -159,7 +159,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 			}
 
 			unetinfo << myname << "(init): init sender.. my node " << n_it.getProp("name") << endl;
-			sender = make_shared<UNetSender>(h, p, shm, s_field, s_fvalue);
+			sender = make_shared<UNetSender>(h, p, shm, s_field, s_fvalue, prefix);
 			sender->setSendPause(sendpause);
 			loga->add(sender->getLog());
 
@@ -169,7 +169,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 				if( !h2.empty() )
 				{
 					unetinfo << myname << "(init): init sender2.. my node " << n_it.getProp("name") << endl;
-					sender2 = make_shared<UNetSender>(h2, p2, shm, s_field, s_fvalue);
+					sender2 = make_shared<UNetSender>(h2, p2, shm, s_field, s_fvalue, prefix);
 					sender2->setSendPause(sendpause);
 					loga->add(sender2->getLog());
 				}
@@ -908,8 +908,8 @@ UniSetTypes::SimpleInfo* UNetExchange::getInfo()
 	for( const auto& r : recvlist )
 	{
 		inf << "[ " << endl;
-		inf << "  chan1: " << ( r.r1 ? r.r1->getShortInfo() : "disable" ) << endl;
-		inf << "  chan2: " << ( r.r2 ? r.r2->getShortInfo() : "disable" ) << endl;
+		inf << "  chan1: " << ( r.r1 ? r.r1->getShortInfo() : "[ DISABLED ]" ) << endl;
+		inf << "  chan2: " << ( r.r2 ? r.r2->getShortInfo() : "[ DISABLED ]" ) << endl;
 		inf << "]" << endl;
 	}
 
@@ -917,8 +917,8 @@ UniSetTypes::SimpleInfo* UNetExchange::getInfo()
 
 	inf << "Senders: " << endl;
 	inf << "[ " << endl;
-	inf << "  chan1: " << ( sender ? sender->getShortInfo() : "disable" ) << endl;
-	inf << "  chan2: " << ( sender2 ? sender2->getShortInfo() : "disable" ) << endl;
+	inf << "  chan1: " << ( sender ? sender->getShortInfo() : "[ DISABLED ]" ) << endl;
+	inf << "  chan2: " << ( sender2 ? sender2->getShortInfo() : "[ DISABLED ]" ) << endl;
 	inf << "]" << endl;
 	inf << endl;
 

extensions/UNetUDP/UNetReceiver.cc

@@ -668,8 +668,9 @@ const std::string UNetReceiver::getShortInfo() const
 	ostringstream s;
 
 	s << setw(15) << std::right << getAddress() << ":" << std::left << setw(6) << getPort()
-	  << ( isLockUpdate() ? "PASSIVE" : "ACTIVE" )
-	  << " recvOK=" << isRecvOK()
+	  << "[ " << setw(7) << ( isLockUpdate() ? "PASSIVE" : "ACTIVE" ) << " ]"
+	  << "    recvOK=" << isRecvOK()
+	  << " receivepack=" << rnum
 	  << " lostPackets=" << setw(6) << getLostPacketsNum()
 	  << endl
 	  << "\t["

extensions/UNetUDP/UNetSender.cc

@@ -467,13 +467,13 @@ const std::string UNetSender::getShortInfo() const
 	s << setw(15) << std::right << getAddress() << ":" << std::left << setw(6) << getPort()
 	  << " lastpacknum=" << packetnum
 	  << " lastcrc=" << setw(6) << lastcrc
-	  << " items=" << maxItem
+	  << " items=" << maxItem << " maxAData=" << getADataSize() << " maxDData=" << getDDataSize()
 	  << endl
-	  << "\t   packs: [sendfactor]=count: "
+	  << "\t   packs([sendfactor]=num): "
 	  << endl;
 
 	for( auto i = mypacks.begin(); i != mypacks.end(); ++i )
-		s << "      \t\t[" << i->first << "]=" << i->second.size() << endl;
+		s << "        \t\t[" << i->first << "]=" << i->second.size() << endl;
 
 	return std::move(s.str());
 }