Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-21 19:29:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1411 from simonduq/pr/fix-chameleon

Browse Source 
Rime Chameleon fix for 32-bit platforms
This commit is contained in:
Simon Duquennoy 2015-12-04 11:45:08 +01:00
commit 5d1feac63e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/net/rime/chameleon-bitopt.c
View File

@ -57,6 +57,8 @@ struct bitopt_hdr {
uint8_t channel[2]; uint8_t channel[2];
}; };
#define BITOPT_HDR_SIZE 2
static const uint8_t bitmask[9] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, static const uint8_t bitmask[9] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0,
0xf8, 0xfc, 0xfe, 0xff }; 0xf8, 0xfc, 0xfe, 0xff };
@ -264,7 +266,7 @@ pack_header(struct channel *c)
all attributes that are used on this channel. */ all attributes that are used on this channel. */
hdrbytesize = c->hdrsize / 8 + ((c->hdrsize & 7) == 0? 0: 1); hdrbytesize = c->hdrsize / 8 + ((c->hdrsize & 7) == 0? 0: 1);
if(packetbuf_hdralloc(hdrbytesize + sizeof(struct bitopt_hdr)) == 0) { if(packetbuf_hdralloc(hdrbytesize + BITOPT_HDR_SIZE) == 0) {
PRINTF("chameleon-bitopt: insufficient space for headers\n"); PRINTF("chameleon-bitopt: insufficient space for headers\n");
return 0; return 0;
} }
@ -272,7 +274,7 @@ pack_header(struct channel *c)
hdr->channel[0] = c->channelno & 0xff; hdr->channel[0] = c->channelno & 0xff;
hdr->channel[1] = (c->channelno >> 8) & 0xff; hdr->channel[1] = (c->channelno >> 8) & 0xff;
hdrptr = ((uint8_t *)packetbuf_hdrptr()) + sizeof(struct bitopt_hdr); hdrptr = ((uint8_t *)packetbuf_hdrptr()) + BITOPT_HDR_SIZE;
memset(hdrptr, 0, hdrbytesize); memset(hdrptr, 0, hdrbytesize);
byteptr = bitptr = 0; byteptr = bitptr = 0;
@ -330,7 +332,7 @@ unpack_header(void)
/* The packet has a header that tells us what channel the packet is /* The packet has a header that tells us what channel the packet is
for. */ for. */
hdr = (struct bitopt_hdr *)packetbuf_dataptr(); hdr = (struct bitopt_hdr *)packetbuf_dataptr();
if(packetbuf_hdrreduce(sizeof(struct bitopt_hdr)) == 0) { if(packetbuf_hdrreduce(BITOPT_HDR_SIZE) == 0) {
PRINTF("chameleon-bitopt: too short packet\n"); PRINTF("chameleon-bitopt: too short packet\n");
return NULL; return NULL;
} }