[Tinyos-beta-commits] CVS: tinyos-1.x/beta/TOSSIM-packet packet_sim.c, 1.8, 1.9

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-1.x/beta/TOSSIM-packet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12627

Modified Files:
	packet_sim.c 
Log Message:
Bugfix from Rodrigo; packet level was cancelling ACKs when it shouldn't have.
Example: A transmits to B, C overhears it. D transmits to C (B does
not hear it). In the old logic, D's transmit to C would look at
C's incoming packets, and cancel all acks on them. This is incorrect,
as B was generating the ack.

Also, I'd like to know what caused me to use "receival" as a word. 
Subliminable messages no doubt.



Index: packet_sim.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/TOSSIM-packet/packet_sim.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** packet_sim.c	24 Jun 2004 20:36:26 -0000	1.8
--- packet_sim.c	7 Oct 2004 22:05:13 -0000	1.9
***************
*** 284,288 ****
      nmemcpy(&msgEvent->msg, msg, sizeof(TOS_Msg));
  
!     dbg(DBG_PACKET, "SIM_PACKET: Considering receival at %i\n", (int)mote);
      
      if (incoming[mote] == NULL &&
--- 284,288 ----
      nmemcpy(&msgEvent->msg, msg, sizeof(TOS_Msg));
  
!     dbg(DBG_PACKET, "SIM_PACKET: Considering reception at %i\n", (int)mote);
      
      if (incoming[mote] == NULL &&
***************
*** 320,324 ****
  	// So, it's possible the sender pointer is NULL before
  	// the receiver handles the packet
! 	if (packet_transmitting[alreadyIncoming->fromID] != NULL) {
  	  packet_transmitting[alreadyIncoming->fromID]->ack = 0;
  	}
--- 320,325 ----
  	// So, it's possible the sender pointer is NULL before
  	// the receiver handles the packet
! 	if (packet_transmitting[alreadyIncoming->fromID] != NULL &&
!             packet_transmitting[alreadyIncoming->fromID]->addr == mote) {
  	  packet_transmitting[alreadyIncoming->fromID]->ack = 0;
  	}