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

If a packet is lost due to NOACK or TXERR, we count the number of transmissions and we add an additional loss penalty (currently one)

Browse source
This commit is contained in:
adamdunkels 2010-06-14 06:51:58 +00:00
parent 1095997b66
commit a6bd51f361
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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.8 2010/06/08 19:25:40 adamdunkels Exp $ * $Id: neighbor-info.c,v 1.9 2010/06/14 06:51:58 adamdunkels Exp $
*/ */
/** /**
* \file * \file
@ -57,6 +57,7 @@
#define ETX_SCALE 100 #define ETX_SCALE 100
#define ETX_ALPHA 80 #define ETX_ALPHA 80
#define ETX_FIRST_GUESS (ETX_LIMIT - 1) #define ETX_FIRST_GUESS (ETX_LIMIT - 1)
#define ETX_LOSS_PENALTY 1
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
NEIGHBOR_ATTRIBUTE(uint8_t, etx, NULL); NEIGHBOR_ATTRIBUTE(uint8_t, etx, NULL);
@ -129,14 +130,9 @@ 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)) {
neighbor_attr_remove_neighbor(dest);
if(subscriber_callback != NULL) {
subscriber_callback(dest, 0, 0);
}
}*/
default: default:
return; packet_etx = numtx + ETX_LOSS_PENALTY;
break;
} }
update_etx(dest, packet_etx); update_etx(dest, packet_etx);
@ -170,5 +166,3 @@ neighbor_info_subscribe(neighbor_info_subscriber_t s)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* XXX use a list of subscribers? */