[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain Drain.h, 1.16, 1.17 DrainLinkEstM.nc, 1.23, 1.24

[Kamin Whitehouse]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32655

Modified Files:
	Drain.h DrainLinkEstM.nc 
Log Message:
adding sequence numbers to the Drain headers.  This is necessary for duplicate rejection.  However, it means 1 more byte in RAM and 1 more byte in every drain packet.

Index: Drain.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/Drain.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Drain.h	18 Aug 2005 22:27:41 -0000	1.16
--- Drain.h	29 Sep 2005 02:37:15 -0000	1.17
***************
*** 88,91 ****
--- 88,92 ----
    uint8_t type;
    uint8_t ttl;
+   uint8_t seqNo;
    uint16_t source;
    uint16_t dest;

Index: DrainLinkEstM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainLinkEstM.nc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DrainLinkEstM.nc	26 Aug 2005 20:44:30 -0000	1.23
--- DrainLinkEstM.nc	29 Sep 2005 02:37:15 -0000	1.24
***************
*** 72,75 ****
--- 72,77 ----
    DrainRouteEntry routes[DRAIN_MAX_ROUTES];
  
+   uint8_t seqNo;
+ 
    bool msgBufBusy;
    TOS_Msg msgBuf;
***************
*** 100,103 ****
--- 102,106 ----
  
      msgBufBusy = FALSE;
+     seqNo = 0;
  
      for(i = 0; i < DRAIN_MAX_ROUTES; i++) {
***************
*** 137,140 ****
--- 140,144 ----
      pMHMsg->type = id;
      pMHMsg->ttl = DRAIN_MAX_TTL - 1;
+     pMHMsg->seqNo = seqNo++;
      pMHMsg->source = TOS_LOCAL_ADDRESS;
      pMHMsg->dest = dest;