diff --git a/core/net/uip-netif.c b/core/net/uip-netif.c index a832a3753..38ce786a4 100644 --- a/core/net/uip-netif.c +++ b/core/net/uip-netif.c @@ -246,7 +246,7 @@ uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr) memcpy(ipaddr->u8 + 8, lladdr, 3); ipaddr->u8[11] = 0xff; ipaddr->u8[12] = 0xfe; - memcpy(ipaddr->u8 + 13, lladdr + 3, 3); + memcpy(ipaddr->u8 + 13, (u8_t*)lladdr + 3, 3); ipaddr->u8[8] ^= 0x02; #else UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER"); diff --git a/cpu/native/net/tapdev6.c b/cpu/native/net/tapdev6.c index 1409b7ed5..d3268c0d5 100644 --- a/cpu/native/net/tapdev6.c +++ b/cpu/native/net/tapdev6.c @@ -31,7 +31,7 @@ * * Author: Adam Dunkels * - * $Id: tapdev6.c,v 1.2 2008/10/14 14:54:23 julienabeille Exp $ + * $Id: tapdev6.c,v 1.3 2008/10/14 16:50:11 julienabeille Exp $ */ @@ -74,7 +74,7 @@ static unsigned long lasttime; #define BUF ((struct uip_eth_hdr *)&uip_buf[0]) #define IPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) -#define DEBUG 1 +#define DEBUG 0 #if DEBUG #define PRINTF(...) printf(__VA_ARGS__) #define PRINT6ADDR(addr) PRINTF("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) diff --git a/examples/webserver-ipv6/Makefile b/examples/webserver-ipv6/Makefile index d5e95b26d..5df017c5c 100644 --- a/examples/webserver-ipv6/Makefile +++ b/examples/webserver-ipv6/Makefile @@ -1,9 +1,8 @@ -all: - make -f Makefile.example TARGET=avr-raven webserver6.elf - avr-objcopy -O ihex -R .eeprom webserver6.elf webserver6.hex - avr-size -C webserver6.elf +all: webserver6 +APPS=webserver +DEFAULT_TARGET=minimal-net -clean: - make -f Makefile.example TARGET=avr-raven clean - rm symbols.c symbols.h webserver6.elf webserver6.hex - rm -rf obj_avr-raven +UIP_CONF_IPV6=1 + +CONTIKI = ../.. +include $(CONTIKI)/Makefile.include diff --git a/examples/webserver-ipv6/Makefile.example b/examples/webserver-ipv6/Makefile.example deleted file mode 100644 index 47bb6e6af..000000000 --- a/examples/webserver-ipv6/Makefile.example +++ /dev/null @@ -1,8 +0,0 @@ -all: webserver6 -APPS=webserver raven-lcd-interface -DEFAULT_TARGET=minimal-net - -UIP_CONF_IPV6=1 - -CONTIKI = ../.. -include $(CONTIKI)/Makefile.include diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h index ce237b989..33d6891e1 100644 --- a/platform/minimal-net/contiki-conf.h +++ b/platform/minimal-net/contiki-conf.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-conf.h,v 1.7 2008/10/14 10:06:26 julienabeille Exp $ + * @(#)$Id: contiki-conf.h,v 1.8 2008/10/14 16:50:11 julienabeille Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -59,8 +59,8 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_LOGGING 0 #define UIP_CONF_UDP_CHECKSUMS 0 -#define UIP_CONF_UDP 0 -#define UIP_CONF_TCP 0 +#define UIP_CONF_UDP 1 +#define UIP_CONF_TCP 1 #define UIP_CONF_IPV6 1 #define UIP_CONF_IPV6_QUEUE_PKT 1 #define UIP_CONF_IPV6_CHECKS 1