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

Bugfix: make sure that neighbor exists before attempting to update tx

Browse source 
count.
This commit is contained in:
adamdunkels 2010-09-28 06:53:02 +00:00
parent 867100a40c
commit 32ba90ea4c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/net/rime/collect.c
View file

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: collect.c,v 1.53 2010/09/22 22:08:08 adamdunkels Exp $ * $Id: collect.c,v 1.54 2010/09/28 06:53:02 adamdunkels Exp $
*/ */
/** /**
@ -901,14 +901,17 @@ node_packet_sent(struct unicast_conn *c, int status, int transmissions)
static void static void
timedout(struct collect_conn *tc) timedout(struct collect_conn *tc)
{ {
struct collect_neighbor *n;
PRINTF("%d.%d: timedout after %d retransmissions (max retransmissions %d): packet dropped\n", PRINTF("%d.%d: timedout after %d retransmissions (max retransmissions %d): packet dropped\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions, rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions,
tc->max_rexmits); tc->max_rexmits);
tc->sending = 0; tc->sending = 0;
collect_neighbor_tx_fail(collect_neighbor_list_find(&tc->neighbor_list, n = collect_neighbor_list_find(&tc->neighbor_list,
&tc->current_parent), &tc->current_parent);
tc->max_rexmits); if(n != NULL) {
collect_neighbor_tx_fail(n, tc->max_rexmits);
}
update_rtmetric(tc); update_rtmetric(tc);
send_next_packet(tc); send_next_packet(tc);
set_keepalive_timer(tc); set_keepalive_timer(tc);