[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/components MVirus.nc, 1.8, 1.9

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12751

Modified Files:
	MVirus.nc 
Log Message:
Bug fix from Jason Lebrun; MVirus was not properly merging status
packets when in the RESPOND state. This means nodes would enter the
RESPOND state at the first status or vector they heard, but then the
required bitmask would empty and the node would return to MAINTAIN
even if it was receiving further status messages (requests).



Index: MVirus.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/components/MVirus.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MVirus.nc	19 May 2005 17:20:01 -0000	1.8
--- MVirus.nc	3 Jul 2005 19:35:35 -0000	1.9
***************
*** 628,632 ****
      if ((state == MVIRUS_RESPOND) &&
  	(currentCapsule == which) &&
! 	(currentCapsule == version)) {
        int i;
        for (i = 0; i < MVIRUS_BITMASK_SIZE; i++) {
--- 628,632 ----
      if ((state == MVIRUS_RESPOND) &&
  	(currentCapsule == which) &&
! 	(currentVersion == version)) {
        int i;
        for (i = 0; i < MVIRUS_BITMASK_SIZE; i++) {