[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Eraser.java, 1.9, 1.10 ImageInjector.java, 1.10, 1.11 Rebooter.java, 1.8, 1.9

[Jonathan Hui]

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

Modified Files:
	Eraser.java ImageInjector.java Rebooter.java 
Log Message:
- Remove hacks since messages have type fields now.



Index: Eraser.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Eraser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Eraser.java	14 Jul 2005 17:36:46 -0000	1.9
--- Eraser.java	17 Jul 2005 21:11:36 -0000	1.10
***************
*** 66,71 ****
  
      advMsg = (DelugeAdvMsg)pingReply.clone();
-     if (advMsg.get_nodeDesc_vNum() == DelugeConsts.DELUGE_INVALID_VNUM)
-       advMsg.set_nodeDesc_imgNum((short)0);
      advMsg.set_sourceAddr(pinger.getPCAddr());
      advMsg.set_type(DelugeConsts.DELUGE_ADV_PC);
--- 66,69 ----

Index: ImageInjector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/ImageInjector.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ImageInjector.java	14 Jul 2005 17:36:46 -0000	1.10
--- ImageInjector.java	17 Jul 2005 21:11:36 -0000	1.11
***************
*** 54,58 ****
  
      if (imageNum < 0 || imageNum >= pinger.getNumImages()) {
!       throw new IllegalArgumentException( "invalid image number" );
      }
  
--- 54,58 ----
  
      if (imageNum < 0 || imageNum >= pinger.getNumImages()) {
!       throw new IllegalArgumentException( "invalid image number " + imageNum );
      }
  
***************
*** 78,87 ****
  
      advMsg = (DelugeAdvMsg)pingReply.clone();
-     if (advMsg.get_nodeDesc_vNum() == DelugeConsts.DELUGE_INVALID_VNUM)
-       advMsg.set_nodeDesc_imgNum((short)0);
      advMsg.set_sourceAddr(pinger.getPCAddr());
      advMsg.set_type(DelugeConsts.DELUGE_ADV_PC);
      advMsg.set_imgDesc_uid(newTOSBootImage.getUIDHash());
-     advMsg.set_imgDesc_vNum(DelugeConsts.DELUGE_INVALID_VNUM);
      advMsg.set_imgDesc_numPgs(delugeImage.getNumPages());
      advMsg.set_imgDesc_numPgsComplete(delugeImage.getNumPages());
--- 78,84 ----
***************
*** 113,116 ****
--- 110,114 ----
      }
      else if (pingReply.get_imgDesc_uid() == newTOSBootImage.getUIDHash()) {
+ 
        if (pingReply.get_imgDesc_numPgsComplete() == pingReply.get_imgDesc_numPgs()) {
  	System.out.println("ERROR: Image already injected:");
***************
*** 125,128 ****
--- 123,127 ----
  	newVersion = pingReply.get_imgDesc_vNum();
        }
+ 
      }
      else {

Index: Rebooter.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Rebooter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Rebooter.java	14 Jul 2005 17:36:46 -0000	1.8
--- Rebooter.java	17 Jul 2005 21:11:36 -0000	1.9
***************
*** 74,77 ****
--- 74,78 ----
      if (newVersion == DelugeConsts.DELUGE_INVALID_VNUM)
        newVersion = 0;
+ 
    }
  
***************
*** 108,111 ****
--- 109,115 ----
      }
  
+     if ( pingReply.get_nodeDesc_uid() == pingReply.get_imgDesc_uid() )
+       throw new IllegalArgumentException( "already executing image" );
+ 
      if( !force )
      {
***************
*** 132,135 ****
--- 136,140 ----
      advMsg.set_type((short)DelugeConsts.DELUGE_ADV_PC);
      advMsg.set_nodeDesc_vNum(newVersion);
+     advMsg.set_nodeDesc_uid(pingReply.get_imgDesc_uid());
      advMsg.set_nodeDesc_imgNum(pingReply.get_imgDesc_imgNum());
      advMsg.set_imgDesc_vNum(DelugeConsts.DELUGE_INVALID_VNUM);
***************
*** 143,154 ****
  	send(advMsg);
  	if (verbose) System.out.print(advMsg);
! 	if (advMsg.get_nodeDesc_vNum() == newVersion) {
! 	  advMsg.set_nodeDesc_vNum(DelugeConsts.DELUGE_INVALID_VNUM);
! 	  advMsg.set_nodeDesc_imgNum(DelugeConsts.DELUGE_INVALID_IMGNUM);
! 	}
! 	else {
! 	  advMsg.set_nodeDesc_vNum(newVersion);
! 	  advMsg.set_nodeDesc_imgNum(pingReply.get_imgDesc_imgNum());
! 	}
  	Thread.currentThread().sleep(1000);
        } catch (Exception e) {
--- 148,155 ----
  	send(advMsg);
  	if (verbose) System.out.print(advMsg);
! 	if (advMsg.get_type() == DelugeConsts.DELUGE_ADV_PC)
! 	  advMsg.set_type(DelugeConsts.DELUGE_ADV_PING);
! 	else
! 	  advMsg.set_type(DelugeConsts.DELUGE_ADV_PC);
  	Thread.currentThread().sleep(1000);
        } catch (Exception e) {