giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CSMA: Do not depend depend on sequence numbers to identify packets

Browse Source
This commit is contained in:
kkrentz 2018-06-21 05:58:28 -07:00
parent 2b0c2d5e4a
commit e4dcba32c9
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
os/net/mac/csma/csma-output.c
View File

@ -130,7 +130,10 @@ MEMB(packet_memb, struct packet_queue, MAX_QUEUED_PACKETS);
MEMB(metadata_memb, struct qbuf_metadata, MAX_QUEUED_PACKETS); MEMB(metadata_memb, struct qbuf_metadata, MAX_QUEUED_PACKETS);
LIST(neighbor_list); LIST(neighbor_list);
static void packet_sent(void *ptr, int status, int num_transmissions); static void packet_sent(struct neighbor_queue *n,
struct packet_queue *q,
int status,
int num_transmissions);
static void transmit_from_queue(void *ptr); static void transmit_from_queue(void *ptr);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static struct neighbor_queue * static struct neighbor_queue *
@ -161,7 +164,7 @@ backoff_period(void)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int static int
send_one_packet(void *ptr) send_one_packet(struct neighbor_queue *n, struct packet_queue *q)
{ {
int ret; int ret;
int last_sent_ok = 0; int last_sent_ok = 0;
@ -237,7 +240,7 @@ send_one_packet(void *ptr)
last_sent_ok = 1; last_sent_ok = 1;
} }
packet_sent(ptr, ret, 1); packet_sent(n, q, ret, 1);
return last_sent_ok; return last_sent_ok;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -255,7 +258,7 @@ transmit_from_queue(void *ptr)
n->transmissions, list_length(n->packet_queue)); n->transmissions, list_length(n->packet_queue));
/* Send first packet in the neighbor queue */ /* Send first packet in the neighbor queue */
queuebuf_to_packetbuf(q->buf); queuebuf_to_packetbuf(q->buf);
send_one_packet(n); send_one_packet(n, q);
} }
} }
} }
@ -388,30 +391,12 @@ tx_ok(struct packet_queue *q, struct neighbor_queue *n, int num_transmissions)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
packet_sent(void *ptr, int status, int num_transmissions) packet_sent(struct neighbor_queue *n,
struct packet_queue *q,
int status,
int num_transmissions)
{ {
struct neighbor_queue *n; if(q->ptr == NULL) {
struct packet_queue *q;
n = ptr;
if(n == NULL) {
return;
}
/* Find out what packet this callback refers to */
for(q = list_head(n->packet_queue);
q != NULL; q = list_item_next(q)) {
if(queuebuf_attr(q->buf, PACKETBUF_ATTR_MAC_SEQNO) ==
packetbuf_attr(PACKETBUF_ATTR_MAC_SEQNO)) {
break;
}
}
if(q == NULL) {
LOG_WARN("packet sent: seqno %u not found\n",
packetbuf_attr(PACKETBUF_ATTR_MAC_SEQNO));
return;
} else if(q->ptr == NULL) {
LOG_WARN("packet sent: no metadata\n"); LOG_WARN("packet sent: no metadata\n");
return; return;
} }