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

Merge pull request #67 from yatch/pr/log-fixes 

Log Message Fixes
This commit is contained in:
Simon Duquennoy 2017-09-11 10:49:15 +02:00 committed by GitHub
parent 4ab0f92c6c d1a24b64ce
commit e0edcd9800
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/net/ipv6/uip6.c
View File

@ -1421,7 +1421,7 @@ uip_process(uint8_t flag)
if(uip_icmp6chksum() != 0xffff) {
UIP_STAT(++uip_stat.icmp.drop);
UIP_STAT(++uip_stat.icmp.chkerr);
LOG_ERR("icmpv6: bad checksum.");
LOG_ERR("icmpv6: bad checksum\n");
goto drop;
}
#endif /*UIP_CONF_IPV6_CHECKS*/

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());

8
os/net/rpl-lite/rpl-dag.c
View File

@ -452,7 +452,7 @@ init_dag(uint8_t instance_id, uip_ipaddr_t *dag_id, rpl_ocp_t ocp,
/* Prefix */
if(!rpl_set_prefix_from_addr(prefix, prefix_len, prefix_flags)) {
LOG_ERR("failed to set prefix");
LOG_ERR("failed to set prefix\n");
return 0;
}
@ -532,7 +532,9 @@ process_dio_init_dag(uip_ipaddr_t *from, rpl_dio_t *dio)
LOG_INFO("initialized DAG with instance ID %u, DAG ID ",
curr_instance.instance_id);
LOG_INFO_6ADDR(&curr_instance.dag.dag_id);
LOG_INFO_(", rank %u\n", curr_instance.dag.rank);
LOG_INFO_(", prexix ");
LOG_INFO_6ADDR(&dio->prefix_info.prefix);
LOG_INFO_("/%u, rank %u\n", dio->prefix_info.length, curr_instance.dag.rank);
LOG_ANNOTATE("#A init=%u\n", curr_instance.dag.dag_id.u8[sizeof(curr_instance.dag.dag_id) - 1]);
@ -548,7 +550,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
if(!curr_instance.used && !rpl_dag_root_is_root()) {
/* Attempt to init our DAG from this DIO */
if(!process_dio_init_dag(from, dio)) {
LOG_WARN("failed to init DAG");
LOG_WARN("failed to init DAG\n");
return;
}
}

2
os/net/rpl-lite/rpl.c
View File

@ -137,7 +137,7 @@ rpl_set_prefix_from_addr(uip_ipaddr_t *addr, unsigned len, uint8_t flags)
uip_ipaddr_t ipaddr;
if(addr == NULL || len == 0 || len > 128 || !(flags & UIP_ND6_RA_FLAG_AUTONOMOUS)) {
LOG_WARN("not-supported or invalid prefix\n");
LOG_WARN("prefix not included, not-supported or invalid\n");
return 0;
}