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

IEEE 802.15.4 log fixes

This commit is contained in:
Simon Duquennoy 2017-07-15 12:05:23 +02:00 committed by Yasuyuki Tanaka
parent 3537d06cc8
commit d1a24b64ce
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/net/mac/framer/frame802154e-ie.c
View File

@ -477,13 +477,13 @@ frame802154e_parse_information_elements(const uint8_t *buf, uint8_t buf_size,
switch(parsing_state) {
case PARSING_HEADER_IE:
if(type != 0) {
LOG_ERR("wrong type %04x\n", ie_desc);
LOG_ERR("header ie: wrong type %04x\n", ie_desc);
return -1;
}
/* Header IE: 2 bytes descriptor, c.f. fig 48n in IEEE 802.15.4e */
len = ie_desc & 0x007f; /* b0-b6 */
id = (ie_desc & 0x7f80) >> 7; /* b7-b14 */
LOG_DBG("header ie len %u id %x\n", len, id);
LOG_DBG("header ie: len %u id %x\n", len, id);
switch(id) {
case HEADER_IE_LIST_TERMINATION_1:
if(len == 0) {
@ -516,13 +516,13 @@ frame802154e_parse_information_elements(const uint8_t *buf, uint8_t buf_size,
break;
case PARSING_PAYLOAD_IE:
if(type != 1) {
LOG_ERR("wrong type %04x\n", ie_desc);
LOG_ERR("payload ie: wrong type %04x\n", ie_desc);
return -1;
}
/* Payload IE: 2 bytes descriptor, c.f. fig 48o in IEEE 802.15.4e */
len = ie_desc & 0x7ff; /* b0-b10 */
id = (ie_desc & 0x7800) >> 11; /* b11-b14 */
LOG_DBG("payload ie len %u id %x\n", len, id);
LOG_DBG("payload ie: len %u id %x\n", len, id);
switch(id) {
case PAYLOAD_IE_MLME:
/* Now expect 'len' bytes of MLME sub-IEs */

1
os/net/mac/framer/framer-802154.c
View File

@ -239,6 +239,7 @@ parse(void)
LOG_INFO("In: %2X", frame.fcf.frame_type);
LOG_INFO_LLADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER));
LOG_INFO_(" ");
LOG_INFO_LLADDR(packetbuf_addr(PACKETBUF_ADDR_RECEIVER));
LOG_INFO_("%d %u (%u)\n", hdr_len, packetbuf_datalen(), packetbuf_totlen());