[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop MultihopConnector.java, 1.13, 1.14 MultihopTreeBuilder.java, 1.5, 1.6

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10722/multihop

Modified Files:
	MultihopConnector.java MultihopTreeBuilder.java 
Log Message:
Changed Java tools to accomodate variable size Drip messages, fixed bugs in TreeBuilder and QueryResult

Index: MultihopConnector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop/MultihopConnector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MultihopConnector.java	7 Sep 2004 22:15:39 -0000	1.13
--- MultihopConnector.java	15 Oct 2004 05:01:45 -0000	1.14
***************
*** 51,56 ****
--- 51,58 ----
      cmdMsg.set_llAck((short)1);
  
+     /*
      System.err.println("Enabling TOSBase with link-layer ACKs");
      send(cmdMsg);
+     */
    }
  

Index: MultihopTreeBuilder.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop/MultihopTreeBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MultihopTreeBuilder.java	21 Sep 2004 03:57:53 -0000	1.5
--- MultihopTreeBuilder.java	15 Oct 2004 05:01:45 -0000	1.6
***************
*** 54,58 ****
        try {
  
! 	beaconMsg.set_beaconSeqno((short)beaconSeqno++);    
  	beaconMsg.set_timestamp(System.currentTimeMillis());
  
--- 54,58 ----
        try {
  
! 	//	beaconMsg.set_beaconSeqno((short)beaconSeqno++);    
  	beaconMsg.set_timestamp(System.currentTimeMillis());