From ced88c2effd5bae0b244ad797e92dc09de7f8d71 Mon Sep 17 00:00:00 2001 From: dak664 Date: Tue, 14 Dec 2010 23:22:01 +0000 Subject: [PATCH] Give jackdaw fe80::0 address and number webservers from fe80::1 --- examples/webserver-ipv6-raven/Huginn/makefsdata.h | 5 ++--- examples/webserver-ipv6-raven/Muninn/makefsdata.h | 5 ++--- platform/avr-ravenusb/contiki-raven-main.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/webserver-ipv6-raven/Huginn/makefsdata.h b/examples/webserver-ipv6-raven/Huginn/makefsdata.h index 4868ca955..745c64687 100644 --- a/examples/webserver-ipv6-raven/Huginn/makefsdata.h +++ b/examples/webserver-ipv6-raven/Huginn/makefsdata.h @@ -1,7 +1,6 @@ #include -/* Link layer ipv6 address will become fe80::102 */ -uint8_t mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2}; +/* Link layer ipv6 address will become fe80::2 */ +uint8_t mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}; uint8_t server_name[16] EEMEM = "huginn"; uint8_t domain_name[30] EEMEM = "localhost"; - diff --git a/examples/webserver-ipv6-raven/Muninn/makefsdata.h b/examples/webserver-ipv6-raven/Muninn/makefsdata.h index e450b2d8b..19c86149d 100644 --- a/examples/webserver-ipv6-raven/Muninn/makefsdata.h +++ b/examples/webserver-ipv6-raven/Muninn/makefsdata.h @@ -1,7 +1,6 @@ #include -/* Link layer ipv6 address will become fe80::101 */ -uint8_t mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01}; +/* Link layer ipv6 address will become fe80::1 */ +uint8_t mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}; uint8_t server_name[16] EEMEM = "muninn"; uint8_t domain_name[30] EEMEM = "localhost"; - diff --git a/platform/avr-ravenusb/contiki-raven-main.c b/platform/avr-ravenusb/contiki-raven-main.c index 25c0bb7d8..57288dc31 100644 --- a/platform/avr-ravenusb/contiki-raven-main.c +++ b/platform/avr-ravenusb/contiki-raven-main.c @@ -168,7 +168,7 @@ PROCESS_THREAD(border_router_process, ev, data) #else uip_ip6addr_t ipaddr; - uip_ip6addr(&ipaddr, 0xbbbb, 0, 0, 0, 0, 0, 0, 0x11); + uip_ip6addr(&ipaddr, 0xbbbb, 0, 0, 0, 0, 0, 0, 0x1); uip_ds6_addr_add(&ipaddr, 0, ADDR_MANUAL); rpl_set_prefix(dag, &ipaddr, 64); #endif