[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip Drip.java, 1.10, 1.11 DripDaemon.java, 1.1, 1.2

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1082

Modified Files:
	Drip.java DripDaemon.java 
Log Message:
lowered Drip send period to 500ms. Gave DripDaemon the ability to increment all newer seqnos.

Index: Drip.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip/Drip.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Drip.java	19 Aug 2005 06:22:45 -0000	1.10
--- Drip.java	24 Aug 2005 18:04:58 -0000	1.11
***************
*** 113,117 ****
      sendCount = 0;
      maxSendCount = SEND_COUNT;
!     trickle.schedule(trickleTask, 0, 1000);
      try {
        wait();
--- 113,117 ----
      sendCount = 0;
      maxSendCount = SEND_COUNT;
!     trickle.schedule(trickleTask, 0, 500);
      try {
        wait();

Index: DripDaemon.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drip/tools/java/net/tinyos/drip/DripDaemon.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DripDaemon.java	19 Aug 2005 06:23:29 -0000	1.1
--- DripDaemon.java	24 Aug 2005 18:04:58 -0000	1.2
***************
*** 99,103 ****
        newStore = false;
      } else {
!       if (!storeForever) {
  	if (seqno == newSeqno) {
  	  log.info("id=" + id + ": done injecting");
--- 99,110 ----
        newStore = false;
      } else {
!       if (storeForever) {
! 	if (newSeqno > seqno) {
! 	  seqno = newSeqno;
! 	  log.info("id=" + id + ": (subsequent) heard packet with old seqno = " + seqno);
! 	  incrementSeqno();
! 	  log.info("id=" + id + ": (subsequent) injecting packet with new seqno = " + seqno);
! 	}
!       } else {
  	if (seqno == newSeqno) {
  	  log.info("id=" + id + ": done injecting");