[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain DrainTest.java, 1.2, 1.3

[Gilman Tolle]

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

Modified Files:
	DrainTest.java 
Log Message:
Fixed DrainTest to stop doublecounting packets.

Index: DrainTest.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/DrainTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DrainTest.java	18 Aug 2005 08:39:35 -0000	1.2
--- DrainTest.java	18 Aug 2005 22:50:44 -0000	1.3
***************
*** 37,40 ****
--- 37,43 ----
      if (nodes.containsKey(new Integer(mhMsg.get_source()))) {
        NodeRec rec = (NodeRec) nodes.get(new Integer(mhMsg.get_source()));
+       if (dtMsg.get_seqno() == rec.lastSeqno) {
+ 	rec.receivedDup++;
+       }
        if (dtMsg.get_seqno() > rec.lastSeqno) {
  	rec.received++;
***************
*** 42,48 ****
  	rec.lastSeqno = dtMsg.get_seqno();
        }
-       if (dtMsg.get_seqno() == rec.lastSeqno) {
- 	rec.receivedDup++;
-       }
        if (dtMsg.get_seqno() < rec.lastSeqno) {
  	rec.lastSeqno = dtMsg.get_seqno();
--- 45,48 ----