[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/mac/tkn154 PibP.nc, 1.9, 1.10 ScanP.nc, 1.10, 1.11

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8896/tos/lib/mac/tkn154

Modified Files:
	PibP.nc ScanP.nc 
Log Message:
incoming beacon payload size was caculated wrongly. fixed.

Index: PibP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/PibP.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PibP.nc	7 May 2009 12:41:36 -0000	1.9
--- PibP.nc	22 May 2009 08:56:32 -0000	1.10
***************
*** 940,944 ****
      uint8_t len = ((ieee154_header_t*) frame->header)->length & FRAMECTL_LENGTH_MASK;
      if ((mhr[MHR_INDEX_FC1] & FC1_FRAMETYPE_MASK) == FC1_FRAMETYPE_BEACON) {
!       uint8_t *payload = call Frame.getPayload(frame);
        len = len - (payload - (uint8_t *) frame->data);
      } 
--- 940,944 ----
      uint8_t len = ((ieee154_header_t*) frame->header)->length & FRAMECTL_LENGTH_MASK;
      if ((mhr[MHR_INDEX_FC1] & FC1_FRAMETYPE_MASK) == FC1_FRAMETYPE_BEACON) {
!       uint8_t *payload = call BeaconFrame.getBeaconPayload(frame);
        len = len - (payload - (uint8_t *) frame->data);
      } 

Index: ScanP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/ScanP.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ScanP.nc	20 May 2009 15:15:44 -0000	1.10
--- ScanP.nc	22 May 2009 08:56:32 -0000	1.11
***************
*** 360,367 ****
        // PASSIVE_SCAN / ACTIVE_SCAN:
        // A beacon frame containing a non-empty payload is always signalled
!       // to the next higher layer (regardless of the value of macAutoRequest),
!       // but it is unclear whether it should in addition be added to the 
!       // PAN Descriptor list when macAutoRequest is set to TRUE. This is,
!       // anyway, what the implementation currently does ... 
  
        if (!call MLME_GET.macAutoRequest())
--- 360,366 ----
        // PASSIVE_SCAN / ACTIVE_SCAN:
        // A beacon frame containing a non-empty payload is always signalled
!       // to the next higher layer (regardless of the value of macAutoRequest);
!       // when macAutoRequest is set to TRUE, then the beacon is always 
!       // stored in the PAN Descriptor list (see 7.1.11.2.1 - Table 68)
  
        if (!call MLME_GET.macAutoRequest())