deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed instant reaction to packet loss. Previously, a neighbor was dropped if no MAC layer ack was received.

Browse source
This commit is contained in:
adamdunkels 2010-06-08 19:25:40 +00:00
parent 4a08f545c9
commit 296c828ac2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/net/neighbor-info.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: neighbor-info.c,v 1.7 2010/05/25 15:29:51 nvt-se Exp $ * $Id: neighbor-info.c,v 1.8 2010/06/08 19:25:40 adamdunkels Exp $
*/ */
/** /**
* \file * \file
@ -78,7 +78,7 @@ update_etx(const rimeaddr_t *dest, int packet_etx)
/* Update the EWMA of the ETX for the neighbor. */ /* Update the EWMA of the ETX for the neighbor. */
new_etx = (ETX_SCALE / 2 + ETX_ALPHA * recorded_etx + new_etx = (ETX_SCALE / 2 + ETX_ALPHA * recorded_etx +
(ETX_SCALE - ETX_ALPHA) * packet_etx) / ETX_SCALE; (ETX_SCALE - ETX_ALPHA) * packet_etx) / ETX_SCALE;
PRINTF("neighbor-info: ETX changed from %d to %d (packet ETX = %d)\n", PRINTF("neighbor-info: ETX changed from %d to %d (packet ETX = %d)\n",
recorded_etx, new_etx, packet_etx); recorded_etx, new_etx, packet_etx);
if(neighbor_attr_has_neighbor(dest)) { if(neighbor_attr_has_neighbor(dest)) {
@ -118,7 +118,7 @@ neighbor_info_packet_sent(int status, int numtx)
return; return;
} }
PRINTF("neighbor-info: packet sent to %d.%d, status=%d, numtx=%d\n", PRINTF("neighbor-info: packet sent to %d.%d, status=%d, numtx=%d\n",
dest->u8[sizeof(*dest) - 2], dest->u8[sizeof(*dest) - 1], dest->u8[sizeof(*dest) - 2], dest->u8[sizeof(*dest) - 1],
status, numtx); status, numtx);
@ -129,12 +129,12 @@ neighbor_info_packet_sent(int status, int numtx)
break; break;
case MAC_TX_ERR: case MAC_TX_ERR:
case MAC_TX_NOACK: case MAC_TX_NOACK:
if(neighbor_attr_has_neighbor(dest)) { /* if(neighbor_attr_has_neighbor(dest)) {
neighbor_attr_remove_neighbor(dest); neighbor_attr_remove_neighbor(dest);
if(subscriber_callback != NULL) { if(subscriber_callback != NULL) {
subscriber_callback(dest, 0, 0); subscriber_callback(dest, 0, 0);
} }
} }*/
default: default:
return; return;
} }
@ -170,3 +170,5 @@ neighbor_info_subscribe(neighbor_info_subscriber_t s)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* XXX use a list of subscribers? */