[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/lqi LqiForwardingEngineP.nc, 1.3, 1.4

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/lqi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2794

Modified Files:
	LqiForwardingEngineP.nc 
Log Message:
Timeout on transmissions.


Index: LqiForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/lqi/LqiForwardingEngineP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LqiForwardingEngineP.nc	13 Apr 2007 00:10:48 -0000	1.3
--- LqiForwardingEngineP.nc	13 Apr 2007 19:38:11 -0000	1.4
***************
*** 297,301 ****
  			    msg,
  			    call SubPacket.payloadLength(msg)) == SUCCESS) {
! 	dbg("LQI", "Packet not acked, retransmit:\t%s\n", fields(msg));
          call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
  					 call CollectionPacket.getSequenceNumber(msg), 
--- 297,301 ----
  			    msg,
  			    call SubPacket.payloadLength(msg)) == SUCCESS) {
! 	dbg("LQI", "Packet not acked, retransmit @%s:\n\t%s\n", sim_time_string(), fields(msg));
          call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
  					 call CollectionPacket.getSequenceNumber(msg), 
***************
*** 303,306 ****
--- 303,307 ----
                                           call AMPacket.destination(msg));
  	fail_count ++;
+ 	return;
        } else {
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL, 
***************
*** 308,313 ****
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
! 	dbg("LQI", "Packet not acked, retransmit fail:\t%s\n", fields(msg));
  	sendFailures++;
        }
      }
--- 309,315 ----
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
! 	dbg("LQI", "Packet not acked, retransmit fail @%s:\n\t%s\n", sim_time_string(), fields(msg));
  	sendFailures++;
+ 	return;
        }
      }
***************
*** 352,356 ****
  			    msg,
  			    call SubPacket.payloadLength(msg)) == SUCCESS) {
! 	dbg("LQI", "Packet not acked, retransmit:\t%s\n", fields(msg));
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
  					 call CollectionPacket.getSequenceNumber(msg), 
--- 354,358 ----
  			    msg,
  			    call SubPacket.payloadLength(msg)) == SUCCESS) {
! 	dbg("LQI", "Packet not acked, retransmit (%hhu) @%s:\n\t%s\n", fail_count, sim_time_string(), fields(msg));
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
  					 call CollectionPacket.getSequenceNumber(msg), 
***************
*** 358,361 ****
--- 360,364 ----
                                           call AMPacket.destination(msg));
  	fail_count ++;
+ 	return;
        } else {
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL, 
***************
*** 363,368 ****
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
! 	dbg("LQI", "Packet not acked, retransmit fail:\t%s\n", fields(msg));
  	sendFailures++;
        }
      }
--- 366,372 ----
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
! 	dbg("LQI", "Packet not acked, retransmit fail @%s:\n\t%s\n", sim_time_string(), fields(msg));
  	sendFailures++;
+ 	return;
        }
      }