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

Changed FRAMER to return negative values for error to allow 0 size headers.

Browse source
This commit is contained in:
Joakim Eriksson 2011-12-31 18:00:21 -08:00 • committed by Niclas Finne
parent d89a4ef4fd
commit 65163a9b57
9 changed files with 239 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/net/mac/nullrdc.c
View file

@ -109,7 +109,7 @@ send_packet(mac_callback_t sent, void *ptr)
packetbuf_set_attr(PACKETBUF_ATTR_MAC_ACK, 1);
#endif /* NULLRDC_802154_AUTOACK || NULLRDC_802154_AUTOACK_HW */
if(NETSTACK_FRAMER.create() == 0) {
if(NETSTACK_FRAMER.create() < 0) {
/* Failed to allocate space for headers */
PRINTF("nullrdc: send failed, too large header\n");
ret = MAC_TX_ERR_FATAL;
@ -220,7 +220,7 @@ packet_input(void)
/* PRINTF("nullrdc: ignored ack\n"); */
} else
#endif /* NULLRDC_802154_AUTOACK */
if(NETSTACK_FRAMER.parse() == 0) {
if(NETSTACK_FRAMER.parse() < 0) {
PRINTF("nullrdc: failed to parse %u\n", packetbuf_datalen());
#if NULLRDC_ADDRESS_FILTER
} else if(!rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER),