[Tinyos-commits] CVS: tinyos-1.x/tools/java/net/tinyos/deluge Pinger.java, 1.3, 1.4

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/deluge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24046

Modified Files:
	Pinger.java 
Log Message:
- Allow operations to occur even if some nodes are not running Deluge.



Index: Pinger.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/deluge/Pinger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Pinger.java	6 Aug 2005 17:40:18 -0000	1.3
--- Pinger.java	23 Aug 2005 01:52:22 -0000	1.4
***************
*** 130,135 ****
  	  dest = MoteIF.TOS_BCAST_ADDR;
  
! 	if ( ( curImage >= numImages && numImages != -1)
! 	    || error )
  	  break;
  
--- 130,134 ----
  	  dest = MoteIF.TOS_BCAST_ADDR;
  
! 	if ( ( curImage >= numImages && numImages != -1) )
  	  break;
  
***************
*** 288,297 ****
  	return;
  
        if (dest != pingReply.get_sourceAddr())
  	return;
  
-       if (numImages == -1)
- 	numImages = pingReply.get_numImages();
- 
        if (pingReplies.get(new Integer(imgNum)) == null) {
  	pingReplies.put(new Integer(imgNum), pingReply);
--- 287,298 ----
  	return;
  
+       if (numImages == -1 || pingReply.get_numImages() > numImages) {
+ 	numImages = pingReply.get_numImages();
+ 	dest = pingReply.get_sourceAddr();
+       }
+ 
        if (dest != pingReply.get_sourceAddr())
  	return;
  
        if (pingReplies.get(new Integer(imgNum)) == null) {
  	pingReplies.put(new Integer(imgNum), pingReply);