mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-08-26 10:28:58 +00:00
Fixes by Ward Van Heddeghem (reapplied from versioin 1.24)
This commit is contained in:
parent
09409fc5a7
commit
f5a57a4e54
@ -1,5 +1,5 @@
|
|||||||
/* XXX: send explicit congestion notification if already forwarding
|
/* XXX: send explicit congestion notification if already forwarding
|
||||||
packet + add queue for keeping packets to forward. */
|
packet. */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \addtogroup rimecollect
|
* \addtogroup rimecollect
|
||||||
@ -36,7 +36,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: collect.c,v 1.25 2009/04/29 20:48:57 adamdunkels Exp $
|
* $Id: collect.c,v 1.26 2009/04/30 20:21:06 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -410,7 +410,6 @@ collect_set_sink(struct collect_conn *tc, int should_be_sink)
|
|||||||
if(should_be_sink) {
|
if(should_be_sink) {
|
||||||
tc->rtmetric = SINK;
|
tc->rtmetric = SINK;
|
||||||
/* neighbor_discovery_start(&tc->neighbor_discovery_conn, tc->rtmetric);*/
|
/* neighbor_discovery_start(&tc->neighbor_discovery_conn, tc->rtmetric);*/
|
||||||
announcement_set_value(&tc->announcement, tc->rtmetric);
|
|
||||||
} else {
|
} else {
|
||||||
tc->rtmetric = RTMETRIC_MAX;
|
tc->rtmetric = RTMETRIC_MAX;
|
||||||
}
|
}
|
||||||
@ -429,7 +428,7 @@ collect_send(struct collect_conn *tc, int rexmits)
|
|||||||
packetbuf_set_attr(PACKETBUF_ATTR_TTL, MAX_HOPLIM);
|
packetbuf_set_attr(PACKETBUF_ATTR_TTL, MAX_HOPLIM);
|
||||||
packetbuf_set_attr(PACKETBUF_ATTR_MAX_REXMIT, rexmits);
|
packetbuf_set_attr(PACKETBUF_ATTR_MAX_REXMIT, rexmits);
|
||||||
|
|
||||||
if(tc->rtmetric == 0) {
|
if(tc->rtmetric == SINK) {
|
||||||
packetbuf_set_attr(PACKETBUF_ATTR_HOPS, 0);
|
packetbuf_set_attr(PACKETBUF_ATTR_HOPS, 0);
|
||||||
if(tc->cb->recv != NULL) {
|
if(tc->cb->recv != NULL) {
|
||||||
tc->cb->recv(packetbuf_addr(PACKETBUF_ADDR_ESENDER),
|
tc->cb->recv(packetbuf_addr(PACKETBUF_ADDR_ESENDER),
|
||||||
|
Loading…
Reference in New Issue
Block a user