(unet2): отлаживаю работу..

extensions/UNet2/UDPPacket.cc

@@ -28,11 +28,11 @@ std::ostream& UniSetUDP::operator<<( std::ostream& os, UniSetUDP::UDPMessage& p
 	os << (UDPHeader*)(&p) << endl;
 
 	os << "DIGITAL:" << endl;
-	for( size_t i=0; i<p.dcount; i++ )
+	for( size_t i=0; i<p.msg.header.dcount; i++ )
 		os << "[" << i << "]={" << p.dID(i) << "," << p.dValue(i) << "}" << endl;
 	
 	os << "ANALOG:" << endl;
-	for( size_t i=0; i<p.acount; i++ )
+	for( size_t i=0; i<p.msg.header.acount; i++ )
 		os << "[" << i << "]={" << p.msg.a_dat[i].id << "," << p.msg.a_dat[i].val << "}" << endl;
 	
 	return os;

extensions/UNet2/UDPPacket.h

@@ -56,8 +56,7 @@ namespace UniSetUDP
 
 	static const int MaxDataLen = sizeof(DataPacket);
 
-	struct UDPMessage:
-		public UDPHeader
+	struct UDPMessage
 	{
 		UDPMessage();
 
@@ -70,9 +69,9 @@ namespace UniSetUDP
 		size_t addAData( long id, long val );
 		bool setAData( size_t index, long val );
 
-		inline bool isFull(){ return ((dcount<MaxDCount) && (acount<MaxACount)); }
-		inline int dsize(){ return dcount; }
-		inline int asize(){ return acount; }
+		inline bool isFull(){ return ((msg.header.dcount<MaxDCount) && (msg.header.acount<MaxACount)); }
+		inline int dsize(){ return msg.header.dcount; }
+		inline int asize(){ return msg.header.acount; }
 //		inline int byte_size(){ return (dcount*sizeof(long)*UDPDData) + acount*sizeof(UDPAData)); }
 		
 		DataPacket msg;

extensions/UNet2/UNetReceiver.cc

@@ -334,7 +334,6 @@ bool UNetReceiver::recv()
 		return false;
 	}
 	
-	// size_t sz = pack.msg.header.acount * sizeof(UniSetUDP::UDPAData) + sizeof(UniSetUDP::UDPHeader);
 	size_t sz = sizeof(UniSetUDP::DataPacket);
 	if( ret < sz )
 	{

extensions/UNet2/UNetSender.cc

@@ -192,8 +192,6 @@ void UNetSender::real_send()
 	if( packetnum > UniSetUDP::MaxPacketNum )
 		packetnum = 1;
 
-//	cout << "************* send header: " << mypack.msg.header << endl;
-//	size_t sz = mypack.byte_size() + sizeof(UniSetUDP::UDPHeader);
 	size_t sz =	sizeof(UniSetUDP::DataPacket);
 	if( !udp->isPending(ost::Socket::pendingOutput) )
 		return;

extensions/UNet2/unet2-tester.cc

@@ -211,9 +211,12 @@ int main(int argc, char* argv[])
 								<< " sizeof=" << sizeof(UniSetUDP::UDPHeader) << endl;
 							continue;
 						}
+
+						cout << "HEADER: " << pack.msg.header << endl;
 		
 						//size_t sz = pack.msg.header.dcount * sizeof(UniSetUDP::UDPData) + sizeof(UniSetUDP::UDPHeader);
-						size_t sz =	sizeof(UniSetUDP::UDPMessage);
+						//size_t sz =	sizeof(UniSetUDP::UDPMessage);
+						size_t sz =	sizeof(UniSetUDP::DataPacket);
 						if( ret < sz )
 						{
 							cerr << "(recv): FAILED data ret=" << ret 
@@ -278,7 +281,8 @@ int main(int argc, char* argv[])
 					mypack.addDData(i,i);
 
 				//size_t sz = mypack.byte_size() + sizeof(UniSetUDP::UDPHeader);
-				size_t sz =	sizeof(UniSetUDP::UDPMessage);
+				//size_t sz =	sizeof(UniSetUDP::UDPMessage);
+				size_t sz =	sizeof(UniSetUDP::DataPacket);
 
 				udp->setPeer(host,port);
 				unsigned long packetnum = 0;