[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net CollectionDebug.nc, 1.2, 1.3 CollectionId.nc, 1.2, 1.3 CollectionIdP.nc, 1.2, 1.3 CollectionPacket.nc, 1.2, 1.3 DisseminationCache.nc, 1.2, 1.3 DisseminationEngineImplP.nc, 1.2, 1.3 DisseminationEngineP.nc, 1.2, 1.3 DisseminationTimerP.nc, 1.2, 1.3 DisseminationUpdate.nc, 1.2, 1.3 DisseminationValue.nc, 1.2, 1.3 DisseminatorC.nc, 1.2, 1.3 DisseminatorP.nc, 1.2, 1.3 RootControl.nc, 1.2, 1.3 TrickleTimer.nc, 1.2, 1.3 TrickleTimerImplP.nc, 1.2, 1.3 TrickleTimerMilliC.nc, 1.2, 1.3 UnicastNameFreeRouting.nc, 1.2, 1.3

Phil Levis scipio at users.sourceforge.net
Tue Nov 7 11:32:21 PST 2006


Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22851/tos/lib/net

Modified Files:
	CollectionDebug.nc CollectionId.nc CollectionIdP.nc 
	CollectionPacket.nc DisseminationCache.nc 
	DisseminationEngineImplP.nc DisseminationEngineP.nc 
	DisseminationTimerP.nc DisseminationUpdate.nc 
	DisseminationValue.nc DisseminatorC.nc DisseminatorP.nc 
	RootControl.nc TrickleTimer.nc TrickleTimerImplP.nc 
	TrickleTimerMilliC.nc UnicastNameFreeRouting.nc 
Log Message:
Merge over into the trunk.







Index: DisseminationEngineImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/DisseminationEngineImplP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DisseminationEngineImplP.nc	12 Jul 2006 17:02:22 -0000	1.2
--- DisseminationEngineImplP.nc	7 Nov 2006 19:31:18 -0000	1.3
***************
*** 121,128 ****
      if ( dMsg->seqno != DISSEMINATION_SEQNO_UNKNOWN ) {
        object = call DisseminationCache.requestData[ key ]( &objectSize );
!       objectSize = 
! 	objectSize < call AMSend.maxPayloadLength() ?
! 	objectSize : call AMSend.maxPayloadLength();
! 
        memcpy( dMsg->data, object, objectSize );
      }      
--- 121,128 ----
      if ( dMsg->seqno != DISSEMINATION_SEQNO_UNKNOWN ) {
        object = call DisseminationCache.requestData[ key ]( &objectSize );
!       if ((objectSize + sizeof(dissemination_message_t)) > 
!            call AMSend.maxPayloadLength()) {
!         objectSize = call AMSend.maxPayloadLength() - sizeof(dissemination_message_t);
!       }
        memcpy( dMsg->data, object, objectSize );
      }      














More information about the Tinyos-2-commits mailing list