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

RPL log fixes

Browse Source
This commit is contained in:
Simon Duquennoy 2017-07-15 09:25:41 +02:00 committed by Yasuyuki Tanaka
parent e9610ec647
commit 3537d06cc8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 */ /* Prefix */
if(!rpl_set_prefix_from_addr(prefix, prefix_len, prefix_flags)) { 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; 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 ", LOG_INFO("initialized DAG with instance ID %u, DAG ID ",
curr_instance.instance_id); curr_instance.instance_id);
LOG_INFO_6ADDR(&curr_instance.dag.dag_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]); 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()) { if(!curr_instance.used && !rpl_dag_root_is_root()) {
/* Attempt to init our DAG from this DIO */ /* Attempt to init our DAG from this DIO */
if(!process_dio_init_dag(from, dio)) { if(!process_dio_init_dag(from, dio)) {
LOG_WARN("failed to init DAG"); LOG_WARN("failed to init DAG\n");
return; 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; uip_ipaddr_t ipaddr;
if(addr == NULL || len == 0 || len > 128 || !(flags & UIP_ND6_RA_FLAG_AUTONOMOUS)) { 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; return 0;
} }