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

Added a function for getting the first global IPv6 address

Browse source
This commit is contained in:
adamdunkels 2010-06-15 19:16:22 +00:00
parent 12a1ad2e7d
commit 560c84a2fe
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,7 +391,7 @@ uip_ds6_defrt_lookup(uip_ipaddr_t * ipaddr)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uip_ipaddr_t * uip_ipaddr_t *
uip_ds6_defrt_choose() uip_ds6_defrt_choose(void)
{ {
uip_ds6_nbr_t *bestnbr; uip_ds6_nbr_t *bestnbr;
@ -476,7 +476,6 @@ uip_ds6_prefix_add(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen,
#endif /* UIP_CONF_ROUTER */ #endif /* UIP_CONF_ROUTER */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_ds6_prefix_rm(uip_ds6_prefix_t * prefix) uip_ds6_prefix_rm(uip_ds6_prefix_t * prefix)
{ {
@ -485,7 +484,6 @@ uip_ds6_prefix_rm(uip_ds6_prefix_t * prefix)
} }
return; return;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uip_ds6_prefix_t * uip_ds6_prefix_t *
uip_ds6_prefix_lookup(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen) uip_ds6_prefix_lookup(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen)
@ -576,10 +574,11 @@ uip_ds6_addr_lookup(uip_ipaddr_t * ipaddr)
* (TENTATIVE, PREFERRED, DEPRECATED) * (TENTATIVE, PREFERRED, DEPRECATED)
*/ */
uip_ds6_addr_t * uip_ds6_addr_t *
uip_ds6_get_link_local(int8_t state) { uip_ds6_get_link_local(int8_t state)
{
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) && (state == - 1 || locaddr->state == state) if((locaddr->isused) && (state == -1 || locaddr->state == state)
&& (uip_is_addr_link_local(&locaddr->ipaddr))) { && (uip_is_addr_link_local(&locaddr->ipaddr))) {
return locaddr; return locaddr;
} }
@ -587,6 +586,25 @@ uip_ds6_get_link_local(int8_t state) {
return NULL; return NULL;
} }
/*---------------------------------------------------------------------------*/
/*
* get a global address -
* state = -1 => any address is ok. Otherwise state = desired state of addr.
* (TENTATIVE, PREFERRED, DEPRECATED)
*/
uip_ds6_addr_t *
uip_ds6_get_global(int8_t state)
{
for(locaddr = uip_ds6_if.addr_list;
locaddr < uip_ds6_if.addr_list + UIP_DS6_ADDR_NB; locaddr++) {
if((locaddr->isused) && (state == -1 || locaddr->state == state)
&& !(uip_is_addr_link_local(&locaddr->ipaddr))) {
return locaddr;
}
}
return NULL;
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uip_ds6_maddr_t * uip_ds6_maddr_t *
uip_ds6_maddr_add(uip_ipaddr_t * ipaddr) uip_ds6_maddr_add(uip_ipaddr_t * ipaddr)

1
core/net/uip-ds6.h
View file

@ -342,6 +342,7 @@ uip_ds6_addr_t *uip_ds6_addr_add(uip_ipaddr_t *ipaddr,
void uip_ds6_addr_rm(uip_ds6_addr_t *addr); void uip_ds6_addr_rm(uip_ds6_addr_t *addr);
uip_ds6_addr_t *uip_ds6_addr_lookup(uip_ipaddr_t *ipaddr); uip_ds6_addr_t *uip_ds6_addr_lookup(uip_ipaddr_t *ipaddr);
uip_ds6_addr_t *uip_ds6_get_link_local(int8_t state); uip_ds6_addr_t *uip_ds6_get_link_local(int8_t state);
uip_ds6_addr_t *uip_ds6_get_global(int8_t state);
/** @} */ /** @} */