Amount of retransmissions now configurable on a per-packet basis
This commit is contained in:
parent
c0d3b9111a
commit
e18b609039
|
@ -33,7 +33,7 @@
|
||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: tree.c,v 1.11 2007/05/15 08:09:21 adamdunkels Exp $
|
* $Id: tree.c,v 1.12 2007/05/22 20:57:44 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -70,6 +70,7 @@ struct hdr {
|
||||||
u8_t originator_seqno;
|
u8_t originator_seqno;
|
||||||
u8_t hopcount;
|
u8_t hopcount;
|
||||||
u8_t hoplim;
|
u8_t hoplim;
|
||||||
|
u8_t rexmits;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define SINK 0
|
#define SINK 0
|
||||||
|
@ -80,8 +81,6 @@ struct hdr {
|
||||||
#define MAX_INTERVAL CLOCK_SECOND * 10
|
#define MAX_INTERVAL CLOCK_SECOND * 10
|
||||||
#define MIN_INTERVAL CLOCK_SECOND * 2
|
#define MIN_INTERVAL CLOCK_SECOND * 2
|
||||||
|
|
||||||
#define MAX_RETRANSMISSIONS 3
|
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -230,7 +229,7 @@ node_packet_received(struct ruc_conn *c, rimeaddr_t *from, u8_t seqno)
|
||||||
tc->forwarding = 1;
|
tc->forwarding = 1;
|
||||||
n = neighbor_best();
|
n = neighbor_best();
|
||||||
if(n != NULL) {
|
if(n != NULL) {
|
||||||
ruc_send(c, &n->addr, MAX_RETRANSMISSIONS);
|
ruc_send(c, &n->addr, hdr->rexmits);
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -299,14 +298,11 @@ tree_set_sink(struct tree_conn *tc, int should_be_sink)
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
void
|
void
|
||||||
tree_send(struct tree_conn *tc)
|
tree_send(struct tree_conn *tc, int rexmits)
|
||||||
{
|
{
|
||||||
struct neighbor *n;
|
struct neighbor *n;
|
||||||
struct hdr *hdr;
|
struct hdr *hdr;
|
||||||
|
|
||||||
if(tc->hops_from_sink == 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(rimebuf_hdralloc(sizeof(struct hdr))) {
|
if(rimebuf_hdralloc(sizeof(struct hdr))) {
|
||||||
hdr = rimebuf_hdrptr();
|
hdr = rimebuf_hdrptr();
|
||||||
|
@ -314,16 +310,24 @@ tree_send(struct tree_conn *tc)
|
||||||
rimeaddr_copy(&hdr->originator, &rimeaddr_node_addr);
|
rimeaddr_copy(&hdr->originator, &rimeaddr_node_addr);
|
||||||
hdr->hopcount = tc->hops_from_sink;
|
hdr->hopcount = tc->hops_from_sink;
|
||||||
hdr->hoplim = MAX_HOPLIM;
|
hdr->hoplim = MAX_HOPLIM;
|
||||||
|
hdr->rexmits = rexmits;
|
||||||
|
if(tc->hops_from_sink == 0) {
|
||||||
|
if(tc->cb->recv != NULL) {
|
||||||
|
tc->cb->recv(&hdr->originator, hdr->originator_seqno,
|
||||||
|
hdr->hopcount);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
n = neighbor_best();
|
n = neighbor_best();
|
||||||
if(n != NULL) {
|
if(n != NULL) {
|
||||||
/* printf("Sending to best neighbor\n");*/
|
/* printf("Sending to best neighbor\n");*/
|
||||||
ruc_send(&tc->ruc_conn, &n->addr, MAX_RETRANSMISSIONS);
|
ruc_send(&tc->ruc_conn, &n->addr, rexmits);
|
||||||
} else {
|
} else {
|
||||||
/* printf("Didn't find any neighbor\n");*/
|
/* printf("Didn't find any neighbor\n");*/
|
||||||
PRINTF("%d.%d: did not find any neighbor to send to\n",
|
PRINTF("%d.%d: did not find any neighbor to send to\n",
|
||||||
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
|
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
int
|
int
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: tree.h,v 1.7 2007/05/15 08:09:21 adamdunkels Exp $
|
* $Id: tree.h,v 1.8 2007/05/22 20:57:44 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -82,7 +82,7 @@ void tree_open(struct tree_conn *c, u16_t channels,
|
||||||
const struct tree_callbacks *callbacks);
|
const struct tree_callbacks *callbacks);
|
||||||
void tree_close(struct tree_conn *c);
|
void tree_close(struct tree_conn *c);
|
||||||
|
|
||||||
void tree_send(struct tree_conn *c);
|
void tree_send(struct tree_conn *c, int rexmits);
|
||||||
|
|
||||||
void tree_set_sink(struct tree_conn *c, int should_be_sink);
|
void tree_set_sink(struct tree_conn *c, int should_be_sink);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue