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

Merge pull request #2644 from cgundogan/rpl_pass_dodag_to_find_parent

Browse Source 
rpl: pass dodag to the rpl_find_parent function
This commit is contained in:
Cenk Gündoğan 2015-03-20 19:52:33 +01:00
commit f2b9b51adb
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/include/rpl/rpl_dodag.h
View File

@ -38,7 +38,7 @@ rpl_dodag_t *rpl_get_my_dodag(void);
void rpl_join_dodag(rpl_dodag_t *dodag, ipv6_addr_t *parent, uint16_t parent_rank);
void rpl_del_dodag(rpl_dodag_t *dodag);
rpl_parent_t *rpl_new_parent(rpl_dodag_t *dodag, ipv6_addr_t *address, uint16_t rank);
rpl_parent_t *rpl_find_parent(ipv6_addr_t *address);
rpl_parent_t *rpl_find_parent(rpl_dodag_t *dodag, ipv6_addr_t *address);
void rpl_leave_dodag(rpl_dodag_t *dodag);
bool rpl_equal_id(ipv6_addr_t *id1, ipv6_addr_t *id2);
ipv6_addr_t *rpl_get_my_preferred_parent(void);

2
sys/net/routing/rpl/rpl_control_messages.c
View File

@ -736,7 +736,7 @@ void rpl_recv_DIO(void)
/********************* Parent Handling *********************/
rpl_parent_t *parent;
parent = rpl_find_parent(&ipv6_buf->srcaddr);
parent = rpl_find_parent(my_dodag, &ipv6_buf->srcaddr);
if (parent == NULL) {
/* add new parent candidate */

7
sys/net/routing/rpl/rpl_dodag.c
View File

@ -188,13 +188,16 @@ rpl_parent_t *rpl_new_parent(rpl_dodag_t *dodag, ipv6_addr_t *address, uint16_t
return rpl_new_parent(dodag, address, rank);
}
rpl_parent_t *rpl_find_parent(ipv6_addr_t *address)
rpl_parent_t *rpl_find_parent(rpl_dodag_t *dodag, ipv6_addr_t *address)
{
rpl_parent_t *parent;
rpl_parent_t *end;
for (parent = &parents[0], end = parents + RPL_MAX_PARENTS; parent < end; parent++) {
if ((parent->used) && (rpl_equal_id(address, &parent->addr))) {
if ((parent->used) && (rpl_equal_id(address, &parent->addr)
&& (parent->dodag->instance->id == dodag->instance->id)
&& (!memcmp(&parent->dodag->dodag_id,
&dodag->dodag_id, sizeof(ipv6_addr_t))))) {
return parent;
}
}