From 50cca91d939bf0d5fd816964b8769b7d3c5b9b23 Mon Sep 17 00:00:00 2001 From: joxe Date: Sun, 9 May 2010 17:53:31 +0000 Subject: [PATCH] made use of the new link-local address api in ds6 --- platform/sky/contiki-sky-main.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c index 44c434216..8bde29951 100644 --- a/platform/sky/contiki-sky-main.c +++ b/platform/sky/contiki-sky-main.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)$Id: contiki-sky-main.c,v 1.82 2010/05/03 13:55:26 nifi Exp $ + * @(#)$Id: contiki-sky-main.c,v 1.83 2010/05/09 17:53:31 joxe Exp $ */ #include @@ -301,19 +301,14 @@ main(int argc, char **argv) printf("Tentative link-local IPv6 address "); { - int i, a; - for(a = 0; a < UIP_DS6_ADDR_NB; a++) { - if(uip_ds6_if.addr_list[a].isused) { - for(i = 0; i < 7; ++i) { - printf("%02x%02x:", - uip_ds6_if.addr_list[a].ipaddr.u8[i * 2], - uip_ds6_if.addr_list[a].ipaddr.u8[i * 2 + 1]); - } - printf("%02x%02x\n", - uip_ds6_if.addr_list[a].ipaddr.u8[14], - uip_ds6_if.addr_list[a].ipaddr.u8[15]); - } + uip_ds6_addr_t *lladdr; + int i; + lladdr = uip_ds6_get_link_local(-1); + for(i = 0; i < 7; ++i) { + printf("%02x%02x:", lladdr->ipaddr.u8[i * 2], + lladdr->ipaddr.u8[i * 2 + 1]); } + printf("%02x%02x\n", lladdr->ipaddr.u8[14], lladdr->ipaddr.u8[15]); } if(1) {