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

Made the number of retransmissions configurable

Browse source
This commit is contained in:
adamdunkels 2007-03-31 18:33:27 +00:00
parent 91aa54dc77
commit 6dc06d09af
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/net/rime/ruc.c
View file

@ -28,12 +28,12 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: ruc.c,v 1.8 2007/03/29 23:18:22 adamdunkels Exp $ * $Id: ruc.c,v 1.9 2007/03/31 18:33:27 adamdunkels Exp $
*/ */
/** /**
* \file * \file
* A brief description of what this file is. * Reliable unicast
* \author * \author
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
@ -70,7 +70,11 @@ static u8_t seqno;
static void static void
sent_by_suc(struct suc_conn *suc) sent_by_suc(struct suc_conn *suc)
{ {
struct ruc_conn *c = (struct ruc_conn *)suc;
c->transmissions_left--;
if(c->transmissions_left == 0) {
suc_cancel(&c->c);
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
@ -79,12 +83,16 @@ recv_from_suc(struct suc_conn *suc, rimeaddr_t *from)
struct ruc_conn *c = (struct ruc_conn *)suc; struct ruc_conn *c = (struct ruc_conn *)suc;
struct ruc_hdr *hdr = rimebuf_dataptr(); struct ruc_hdr *hdr = rimebuf_dataptr();
PRINTF("%d: ruc: recv_from_suc type %d seqno %d\n", rimeaddr_node_addr.u16, PRINTF("%d.%d: ruc: recv_from_suc from %d.%d type %d seqno %d\n",
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1],
from->u8[0], from->u8[1],
hdr->type, hdr->seqno); hdr->type, hdr->seqno);
if(hdr->type == TYPE_ACK) { if(hdr->type == TYPE_ACK) {
if(hdr->seqno == seqno) { if(hdr->seqno == seqno) {
PRINTF("%d: ruc: ACKed\n", rimeaddr_node_addr.u16); PRINTF("%d.%d: ruc: ACKed %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
hdr->seqno);
++seqno; ++seqno;
suc_cancel(&c->c); suc_cancel(&c->c);
if(c->u->sent != NULL) { if(c->u->sent != NULL) {
@ -97,15 +105,15 @@ recv_from_suc(struct suc_conn *suc, rimeaddr_t *from)
packet_seqno = hdr->seqno; packet_seqno = hdr->seqno;
rimebuf_hdrreduce(sizeof(struct ruc_hdr)); rimebuf_hdrreduce(sizeof(struct ruc_hdr));
if(c->u->recv != NULL) { if(c->u->recv != NULL) {
send_ack = c->u->recv(c, from, packet_seqno); send_ack = c->u->recv(c, from, packet_seqno);
} }
if(send_ack) { if(send_ack) {
PRINTF("%d: ruc: Sending ACK to %d for %d\n", PRINTF("%d.%d: ruc: Sending ACK to %d.%d for %d\n",
rimeaddr_node_addr.u16, from->u16, rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1],
from->u8[0], from->u8[1],
packet_seqno); packet_seqno);
rimebuf_clear(); rimebuf_clear();
rimebuf_hdralloc(sizeof(struct ruc_hdr)); rimebuf_hdralloc(sizeof(struct ruc_hdr));
@ -114,7 +122,8 @@ recv_from_suc(struct suc_conn *suc, rimeaddr_t *from)
hdr->seqno = packet_seqno; hdr->seqno = packet_seqno;
suc_send(&c->c, from); suc_send(&c->c, from);
} else { } else {
PRINTF("%d: Not sending ACK\n", rimeaddr_node_addr.u16); PRINTF("%d.%d: Not sending ACK\n",
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1]);
} }
} }
} }
@ -136,12 +145,13 @@ ruc_close(struct ruc_conn *c)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
ruc_send(struct ruc_conn *c, rimeaddr_t *receiver) ruc_send(struct ruc_conn *c, rimeaddr_t *receiver, u8_t max_retransmissions)
{ {
if(rimebuf_hdralloc(sizeof(struct ruc_hdr))) { if(rimebuf_hdralloc(sizeof(struct ruc_hdr))) {
struct ruc_hdr *hdr = rimebuf_hdrptr(); struct ruc_hdr *hdr = rimebuf_hdrptr();
hdr->type = TYPE_DATA; hdr->type = TYPE_DATA;
hdr->seqno = seqno; hdr->seqno = seqno;
c->transmissions_left = max_retransmissions;
return suc_send_stubborn(&c->c, receiver); return suc_send_stubborn(&c->c, receiver);
} }
return 0; return 0;

7
core/net/rime/ruc.h
View file

@ -28,12 +28,12 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: ruc.h,v 1.5 2007/03/19 22:10:17 adamdunkels Exp $ * $Id: ruc.h,v 1.6 2007/03/31 18:33:27 adamdunkels Exp $
*/ */
/** /**
* \file * \file
* A brief description of what this file is. * Reliable unicast header file
* \author * \author
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
@ -54,12 +54,13 @@ struct ruc_conn {
struct suc_conn c; struct suc_conn c;
const struct ruc_callbacks *u; const struct ruc_callbacks *u;
u8_t state; u8_t state;
u8_t transmissions_left;
}; };
void ruc_open(struct ruc_conn *c, u16_t channel, void ruc_open(struct ruc_conn *c, u16_t channel,
const struct ruc_callbacks *u); const struct ruc_callbacks *u);
void ruc_close(struct ruc_conn *c); void ruc_close(struct ruc_conn *c);
int ruc_send(struct ruc_conn *c, rimeaddr_t *receiver); int ruc_send(struct ruc_conn *c, rimeaddr_t *receiver, u8_t max_retransmissions);
#endif /* __RRUC_H__ */ #endif /* __RRUC_H__ */