[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/ctp CtpForwardingEngineP.nc, 1.1.2.3, 1.1.2.4

[Kyle Jamieson]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CtpForwardingEngineP.nc 
Log Message:
Use THL for CTP duplicate suppression.

Index: CtpForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/Attic/CtpForwardingEngineP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** CtpForwardingEngineP.nc	29 Aug 2006 14:05:37 -0000	1.1.2.3
--- CtpForwardingEngineP.nc	29 Aug 2006 16:43:10 -0000	1.1.2.4
***************
*** 813,818 ****
    command void CtpPacket.setSequenceNumber(message_t* msg, uint8_t _seqno) {getHeader(msg)->originSeqNo = _seqno;}
  
  
-   
    command uint32_t CtpPacket.getPacketId(message_t* msg) {
      uint32_t id = call CtpPacket.getOrigin(msg);
--- 813,819 ----
    command void CtpPacket.setSequenceNumber(message_t* msg, uint8_t _seqno) {getHeader(msg)->originSeqNo = _seqno;}
  
+   // A CTP packet ID is based on the origin and the THL field, to
+   // implement duplicate suppression as described in TEP 123.
  
    command uint32_t CtpPacket.getPacketId(message_t* msg) {
      uint32_t id = call CtpPacket.getOrigin(msg);
***************
*** 820,824 ****
      id |= call CtpPacket.getType(msg);
      id = id << 8;
!     id |= call CtpPacket.getSequenceNumber(msg);
      return id;
    }
--- 821,825 ----
      id |= call CtpPacket.getType(msg);
      id = id << 8;
!     id |= call CtpPacket.getThl(msg);
      return id;
    }