[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Downloader.java, 1.3, 1.4 Eraser.java, 1.8, 1.9 ImageInjector.java, 1.9, 1.10 Pinger.java, 1.12, 1.13 Rebooter.java, 1.7, 1.8

[Jonathan Hui]

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

Modified Files:
	Downloader.java Eraser.java ImageInjector.java Pinger.java 
	Rebooter.java 
Log Message:
- Ignore packets coming from the pc. This can be an issue when
interacting over multiple TOSBases that can hear each other.



Index: Downloader.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Downloader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Downloader.java	12 Jul 2005 18:03:37 -0000	1.3
--- Downloader.java	14 Jul 2005 17:36:46 -0000	1.4
***************
*** 265,268 ****
--- 265,273 ----
        DelugeAdvMsg adv = (DelugeAdvMsg)m;
  
+       if ( verbose ) System.out.print(adv);
+ 
+       if ( adv.get_type() != DelugeConsts.DELUGE_ADV_NORMAL )
+ 	return;
+ 
        if ( reqDest == MoteIF.TOS_BCAST_ADDR
  	   && adv.get_imgDesc_vNum() == pingReply.get_imgDesc_vNum()

Index: Eraser.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Eraser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Eraser.java	12 Jul 2005 18:03:55 -0000	1.8
--- Eraser.java	14 Jul 2005 17:36:46 -0000	1.9
***************
*** 236,239 ****
--- 236,242 ----
        if (verbose) System.out.print(rxAdvMsg);
  
+       if ( rxAdvMsg.get_type() != DelugeConsts.DELUGE_ADV_NORMAL )
+ 	return;
+ 
        if (advMsg.get_imgDesc_vNum() == rxAdvMsg.get_imgDesc_vNum()
  	  && advMsg.get_imgDesc_numPgs() == rxAdvMsg.get_imgDesc_numPgsComplete()) {

Index: ImageInjector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/ImageInjector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ImageInjector.java	13 Jul 2005 06:02:06 -0000	1.9
--- ImageInjector.java	14 Jul 2005 17:36:46 -0000	1.10
***************
*** 220,223 ****
--- 220,226 ----
        if (verbose) System.out.print(rxAdvMsg);
  
+       if ( rxAdvMsg.get_type() != DelugeConsts.DELUGE_ADV_NORMAL )
+ 	return;
+ 
        if (advMsg.get_imgDesc_vNum() == rxAdvMsg.get_imgDesc_vNum()
  	  && advMsg.get_imgDesc_numPgs() == rxAdvMsg.get_imgDesc_numPgsComplete()) {

Index: Pinger.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Pinger.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Pinger.java	12 Jul 2005 18:03:37 -0000	1.12
--- Pinger.java	14 Jul 2005 17:36:46 -0000	1.13
***************
*** 261,264 ****
--- 261,267 ----
  	dest = pingReply.get_sourceAddr();
  
+       if ( pingReply.get_type() != DelugeConsts.DELUGE_ADV_NORMAL )
+ 	return;
+ 
        if (dest != pingReply.get_sourceAddr())
  	return;

Index: Rebooter.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Rebooter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Rebooter.java	29 Jun 2005 21:08:32 -0000	1.7
--- Rebooter.java	14 Jul 2005 17:36:46 -0000	1.8
***************
*** 169,179 ****
    public void messageReceived(int to, Message m) {
  
!     DelugeAdvMsg rxAdvMsg = (DelugeAdvMsg)m;
!     if (verbose) System.out.print(rxAdvMsg);
!     
!     if (newVersion == rxAdvMsg.get_nodeDesc_vNum()
! 	&& !rebootAcked) {
!       System.out.println("Reboot message sent.");	  
!       rebootAcked = true;
      }
      
--- 169,191 ----
    public void messageReceived(int to, Message m) {
  
!     switch(m.amType()) {
! 
!     case DelugeAdvMsg.AM_TYPE:
!       
!       DelugeAdvMsg rxAdvMsg = (DelugeAdvMsg)m;
!       
!       if (verbose) System.out.print(rxAdvMsg);
!       
!       if ( rxAdvMsg.get_type() != DelugeConsts.DELUGE_ADV_NORMAL )
! 	return;    
!       
!       if (newVersion == rxAdvMsg.get_nodeDesc_vNum()
! 	  && !rebootAcked) {
! 	System.out.println("Reboot message sent.");	  
! 	rebootAcked = true;
!       }
!       
!       break;
! 
      }