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

Reconfigured the timeouts to work better on top of a power-cycling radio mechanism

Browse source
This commit is contained in:
adamdunkels 2010-02-02 21:12:29 +00:00
parent 28052c655f
commit 901a128e7f
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/net/uip-over-mesh.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: uip-over-mesh.c,v 1.15 2009/11/08 19:40:16 adamdunkels Exp $ * $Id: uip-over-mesh.c,v 1.16 2010/02/02 21:12:29 adamdunkels Exp $
*/ */
/** /**
@ -47,6 +47,8 @@
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/rime/trickle.h" #include "net/rime/trickle.h"
#define ROUTE_TRICKLE_INTERVAL CLOCK_SECOND * 8
#define ROUTE_DISCOVERY_INTERVAL CLOCK_SECOND * 4
#define ROUTE_TIMEOUT CLOCK_SECOND * 4 #define ROUTE_TIMEOUT CLOCK_SECOND * 4
static struct queuebuf *queued_packet; static struct queuebuf *queued_packet;
@ -194,12 +196,13 @@ uip_over_mesh_init(u16_t channels)
uip_hostaddr.u8[2], uip_hostaddr.u8[3]); uip_hostaddr.u8[2], uip_hostaddr.u8[3]);
unicast_open(&dataconn, channels, &data_callbacks); unicast_open(&dataconn, channels, &data_callbacks);
route_discovery_open(&route_discovery, CLOCK_SECOND / 4, route_discovery_open(&route_discovery, ROUTE_DISCOVERY_INTERVAL,
channels + 1, &rdc); channels + 1, &rdc);
trickle_open(&gateway_announce_conn, CLOCK_SECOND * 4, channels + 3, trickle_open(&gateway_announce_conn, ROUTE_TRICKLE_INTERVAL, channels + 3,
&trickle_call); &trickle_call);
/* Set lifetime to 10 seconds for non-refreshed routes. */ route_init();
/* Set lifetime to 30 seconds for non-refreshed routes. */
route_set_lifetime(30); route_set_lifetime(30);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -253,6 +256,7 @@ uip_over_mesh_send(void)
waiting for an ACK. */ waiting for an ACK. */
if(BUF->proto == UIP_PROTO_TCP) { if(BUF->proto == UIP_PROTO_TCP) {
packetbuf_set_attr(PACKETBUF_ATTR_ERELIABLE, 1); packetbuf_set_attr(PACKETBUF_ATTR_ERELIABLE, 1);
packetbuf_set_attr(PACKETBUF_ATTR_PACKET_TYPE, PACKETBUF_ATTR_PACKET_TYPE_STREAM);
} }
rt = route_lookup(&receiver); rt = route_lookup(&receiver);