remembering last received packet id to avoid multiple recv callbacks for the same retransmitted packet (but still sending back acks of course)

This commit is contained in:
fros4943 2009-02-17 12:40:18 +00:00
parent 0ae2ac378e
commit 97f76126e6
2 changed files with 14 additions and 4 deletions

View file

@ -34,7 +34,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: runicast.c,v 1.2 2008/07/07 23:27:57 adamdunkels Exp $ * $Id: runicast.c,v 1.3 2009/02/17 12:40:18 fros4943 Exp $
*/ */
/** /**
@ -165,7 +165,15 @@ recv_from_stunicast(struct stunicast_conn *stunicast, rimeaddr_t *from)
queuebuf_free(q); queuebuf_free(q);
} }
if(c->u->recv != NULL) { if(c->u->recv != NULL) {
if (packet_seqno != c->lastrecv) {
c->u->recv(c, from, packet_seqno); c->u->recv(c, from, packet_seqno);
c->lastrecv = packet_seqno; /* remember last received packet */
} else {
PRINTF("%d.%d: runicast: Supressing duplicate receive callback from %d.%d for %d\n",
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1],
from->u8[0], from->u8[1],
packet_seqno);
}
} }
} }
} }
@ -181,6 +189,7 @@ runicast_open(struct runicast_conn *c, uint16_t channel,
c->u = u; c->u = u;
c->rxmit = 0; c->rxmit = 0;
c->sndnxt = 0; c->sndnxt = 0;
c->lastrecv = 0xFF;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void

View file

@ -45,7 +45,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: runicast.h,v 1.1 2008/07/03 21:52:25 adamdunkels Exp $ * $Id: runicast.h,v 1.2 2009/02/17 12:40:18 fros4943 Exp $
*/ */
/** /**
@ -75,6 +75,7 @@ struct runicast_conn {
struct stunicast_conn c; struct stunicast_conn c;
const struct runicast_callbacks *u; const struct runicast_callbacks *u;
uint8_t sndnxt; uint8_t sndnxt;
uint8_t lastrecv;
uint8_t rxmit; uint8_t rxmit;
uint8_t max_rxmit; uint8_t max_rxmit;
}; };