riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpl: allow 0 as instance id

Browse Source
This commit is contained in:
Cenk Gündoğan 2015-08-27 14:38:08 +02:00
parent b16b8a9609
commit b8c0498fb4
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c
View File

@ -435,11 +435,6 @@ gnrc_rpl_dodag_t *gnrc_rpl_root_dodag_init(uint8_t instance_id, ipv6_addr_t *dod
gnrc_rpl_instance_t *inst = NULL; gnrc_rpl_instance_t *inst = NULL;
gnrc_rpl_dodag_t *dodag = NULL; gnrc_rpl_dodag_t *dodag = NULL;
if (instance_id == 0) {
DEBUG("RPL: instance id (%d) must be a positive number greater than zero\n", instance_id);
return NULL;
}
if (gnrc_ipv6_netif_find_by_addr(&configured_addr, dodag_id) == KERNEL_PID_UNDEF) { if (gnrc_ipv6_netif_find_by_addr(&configured_addr, dodag_id) == KERNEL_PID_UNDEF) {
DEBUG("RPL: no IPv6 address configured to match the given dodag id: %s\n", DEBUG("RPL: no IPv6 address configured to match the given dodag id: %s\n",
ipv6_addr_to_str(addr_str, dodag_id, sizeof(addr_str))); ipv6_addr_to_str(addr_str, dodag_id, sizeof(addr_str)));

5
sys/shell/commands/sc_gnrc_rpl.c
View File

@ -45,11 +45,6 @@ int _gnrc_rpl_dodag_root(char *arg1, char *arg2)
uint8_t instance_id = (uint8_t) atoi(arg1); uint8_t instance_id = (uint8_t) atoi(arg1);
ipv6_addr_t dodag_id; ipv6_addr_t dodag_id;
if (instance_id == 0) {
puts("<instance_id> must be a positive number greater than zero");
return 1;
}
if (ipv6_addr_from_str(&dodag_id, arg2) == NULL) { if (ipv6_addr_from_str(&dodag_id, arg2) == NULL) {
puts("<dodag_id> must be a valid IPv6 address"); puts("<dodag_id> must be a valid IPv6 address");
return 1; return 1;