deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed bug that caused select_src to set a non legal address - now sets unspecified if no address found

Browse source
This commit is contained in:
joxe 2010-05-10 11:10:27 +00:00
parent 2bfeb01dcd
commit c0c7cea3ce
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/net/uip-ds6.c
View file

@ -766,10 +766,10 @@ uip_ds6_select_src(uip_ipaddr_t *src, uip_ipaddr_t *dst)
{ {
uint8_t best = 0; /* number of bit in common with best match */ uint8_t best = 0; /* number of bit in common with best match */
uint8_t n = 0; uint8_t n = 0;
uip_ds6_addr_t *matchaddr = uip_ds6_if.addr_list; uip_ds6_addr_t *matchaddr = NULL;
if(!uip_is_addr_link_local(dst) && !uip_is_addr_mcast(dst)) { if(!uip_is_addr_link_local(dst) && !uip_is_addr_mcast(dst)) {
// find longest match /* find longest match */
for(locaddr = uip_ds6_if.addr_list; for(locaddr = uip_ds6_if.addr_list;
locaddr < uip_ds6_if.addr_list + UIP_DS6_ADDR_NB; locaddr++) { locaddr < uip_ds6_if.addr_list + UIP_DS6_ADDR_NB; locaddr++) {
if((locaddr->isused) && (locaddr->state == ADDR_PREFERRED)) { if((locaddr->isused) && (locaddr->state == ADDR_PREFERRED)) {
@ -784,8 +784,12 @@ uip_ds6_select_src(uip_ipaddr_t *src, uip_ipaddr_t *dst)
matchaddr = uip_ds6_get_link_local(ADDR_PREFERRED); matchaddr = uip_ds6_get_link_local(ADDR_PREFERRED);
} }
uip_ipaddr_copy(src, &matchaddr->ipaddr); /* use the :: (unspecified address) as source if no match found */
return; if(matchaddr == NULL) {
uip_create_unspecified(src);
} else {
uip_ipaddr_copy(src, &matchaddr->ipaddr);
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/