[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain Drain.h, 1.7, 1.8 DrainLinkEstM.nc, 1.11, 1.12 DrainM.nc, 1.10, 1.11

[Gilman Tolle]

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

Modified Files:
	Drain.h DrainLinkEstM.nc DrainM.nc 
Log Message:
2 small tweaks: lowered the max backoff time to 4 seconds from 65 seconds, and changed the behavior when sending to the default address to send to the broadcast address if no tree has been built.

Index: Drain.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/Drain.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Drain.h	16 Mar 2005 02:19:31 -0000	1.7
--- Drain.h	7 Jun 2005 16:36:23 -0000	1.8
***************
*** 48,52 ****
    DRAIN_MAX_RETRANSMITS = 0, // does nothing, for now.
    DRAIN_MAX_MISSED_BEACONS = 5,
!   DRAIN_MAX_BACKOFF = 16,
    DRAIN_UNKNOWN_ACK_EST = 127,
    DRAIN_MAX_ROUTES = 1,
--- 48,52 ----
    DRAIN_MAX_RETRANSMITS = 0, // does nothing, for now.
    DRAIN_MAX_MISSED_BEACONS = 5,
!   DRAIN_MAX_BACKOFF = 12,
    DRAIN_UNKNOWN_ACK_EST = 127,
    DRAIN_MAX_ROUTES = 1,

Index: DrainLinkEstM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainLinkEstM.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DrainLinkEstM.nc	4 May 2005 21:20:04 -0000	1.11
--- DrainLinkEstM.nc	7 Jun 2005 16:36:23 -0000	1.12
***************
*** 161,165 ****
      
      if (dest == TOS_DEFAULT_ADDR) {
!       pMHMsg->dest = routes[0].dest;
      } else {
        pMHMsg->dest = dest;
--- 161,169 ----
      
      if (dest == TOS_DEFAULT_ADDR) {
!       if (routes[0].dest == DRAIN_INVALID_DEST) {
! 	pMHMsg->dest = TOS_BCAST_ADDR;
!       } else {
! 	pMHMsg->dest = routes[0].dest;
!       }
      } else {
        pMHMsg->dest = dest;

Index: DrainM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DrainM.nc	4 May 2005 21:20:04 -0000	1.10
--- DrainM.nc	7 Jun 2005 16:36:23 -0000	1.11
***************
*** 375,379 ****
  	  call Timer.start(TIMER_ONE_SHOT, 1 << backoff);
  	  return SUCCESS;
! 	}	
        } 
        else 
--- 375,381 ----
  	  call Timer.start(TIMER_ONE_SHOT, 1 << backoff);
  	  return SUCCESS;
! 	} else {
! 	  // We seem to have hit max backoff.
! 	}
        } 
        else