[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/le LinkEstimatorP.nc, 1.8, 1.9

[Phil Levis]

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

Modified Files:
	LinkEstimatorP.nc 
Log Message:
Do not consider footer when calculating whether a payload size is valid.



Index: LinkEstimatorP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/le/LinkEstimatorP.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LinkEstimatorP.nc	19 Sep 2007 15:05:03 -0000	1.8
--- LinkEstimatorP.nc	27 Oct 2007 00:09:23 -0000	1.9
***************
*** 722,727 ****
    command void* Packet.getPayload(message_t* msg, uint8_t len) {
      linkest_header_t *hdr = getHeader(msg);
!     uint8_t footerLen = (hdr->flags & NUM_ENTRIES_FLAG) * sizeof(linkest_header_t);
!     void* payload = call SubPacket.getPayload(msg, len + footerLen);
      if (payload != NULL) {
        payload += sizeof(linkest_header_t);
--- 722,726 ----
    command void* Packet.getPayload(message_t* msg, uint8_t len) {
      linkest_header_t *hdr = getHeader(msg);
!     void* payload = call SubPacket.getPayload(msg, len +  sizeof(linkest_header_t));
      if (payload != NULL) {
        payload += sizeof(linkest_header_t);