From 543408db6803bea268945ce0424d919f03ce9236 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Fri, 22 Sep 2017 15:06:44 +0200 Subject: [PATCH] Re-organzie ip stack implementation --- Makefile.include | 6 +++++- arch/cpu/msp430/uip-ipchksum.c | 2 +- arch/cpu/native/net/tapdev-drv.c | 4 ++-- arch/cpu/native/net/tapdev.c | 4 ++-- arch/cpu/native/net/tapdev6.c | 4 ++-- arch/cpu/nrf52832/ble/ble-mac.c | 4 ++-- arch/dev/enc28j60/enc28j60-ip64-driver.c | 4 ++-- arch/dev/enc28j60/enc28j60-ip64-driver.h | 2 +- arch/platform/cc2538dk/contiki-main.c | 4 ++-- arch/platform/cooja-ip64/Makefile.cooja-ip64 | 2 +- .../cooja-ip64/contiki-cooja-ip64-main.c | 8 ++++---- arch/platform/cooja-ip64/ip64-conf.h | 4 ++-- arch/platform/cooja/Makefile.cooja | 4 ++-- arch/platform/cooja/contiki-cooja-main.c | 2 +- arch/platform/cooja/dev/ip.c | 2 +- arch/platform/cooja/net/uip-driver.c | 4 ++-- arch/platform/cooja/testapps/testuip.c | 2 +- arch/platform/jn516x/contiki-jn516x-main.c | 2 +- arch/platform/jn516x/dev/micromac-radio.c | 2 +- arch/platform/jn516x/lib/slip.c | 2 +- arch/platform/native/Makefile.native | 2 +- arch/platform/native/contiki-main.c | 2 +- arch/platform/openmote-cc2538/contiki-main.c | 4 ++-- arch/platform/zoul/Makefile.zoul | 4 ---- arch/platform/zoul/contiki-main.c | 4 ++-- arch/platform/zoul/orion/ip64-conf.h | 2 +- examples/http-socket/http-example.c | 2 +- examples/ip64-router/ip64-router.c | 2 +- examples/ipso-objects/example-ipso-objects.c | 2 +- examples/ipso-objects/example-server.c | 4 ++-- examples/ipso-objects/serial-protocol.c | 4 ++-- examples/ipv6/json-ws/json-ws-udp.c | 2 +- examples/ipv6/multicast/root.c | 2 +- examples/ipv6/multicast/sink.c | 2 +- .../native-border-router/border-router-cmds.c | 4 ++-- .../ipv6/native-border-router/border-router.c | 4 ++-- .../ipv6/native-border-router/border-router.h | 2 +- .../ipv6/native-border-router/tun-bridge.c | 4 ++-- .../ipv6/rpl-border-router/border-router.c | 4 ++-- examples/ipv6/rpl-border-router/slip-bridge.c | 4 ++-- examples/ipv6/rpl-simple/node.c | 4 ++-- examples/ipv6/rpl-tsch-sixtop/node-sixtop.c | 2 +- examples/ipv6/rpl-tsch/node.c | 2 +- examples/ipv6/rpl-udp/udp-client.c | 6 +++--- examples/ipv6/rpl-udp/udp-server.c | 4 ++-- examples/ipv6/slip-radio/Makefile | 2 +- examples/ipv6/slip-radio/slip-net.c | 2 +- examples/ipv6/slip-radio/slip-radio.c | 4 ++-- examples/ipv6/udp-ipv6/udp-client.c | 4 ++-- examples/ipv6/udp-ipv6/udp-server.c | 2 +- .../cc2538-common/mqtt-demo/mqtt-demo.c | 2 +- .../udp-ipv6-echo-server/udp-echo-server.c | 2 +- .../cc26xx-web-demo/cetic-6lbr-client.c | 4 ++-- .../cc26xx/cc26xx-web-demo/mqtt-client.c | 2 +- .../cc26xx/cc26xx-web-demo/net-uart.c | 8 ++++---- .../cc26xx/cc26xx-web-demo/net-uart.h | 2 +- .../jn516x/rpl/border-router/border-router.c | 2 +- .../jn516x/rpl/border-router/slip-bridge.c | 4 ++-- .../jn516x/rpl/coap-dongle-node/dongle-node.c | 2 +- .../jn516x/rpl/coap-dr1175-node/dr1175-node.c | 2 +- .../jn516x/rpl/coap-dr1199-node/dr1199-node.c | 2 +- .../platform-specific/jn516x/rpl/node/node.c | 2 +- .../jn516x/rpl/tools/rpl-tools.c | 4 ++-- .../tsch/simple-sensor-network/node/node.c | 8 ++++---- .../rpl-border-router/border-router.c | 4 ++-- .../rpl-border-router/slip-bridge.c | 4 ++-- .../jn516x/tsch/tools/rpl-tools.c | 4 ++-- .../tsch/tx-power-verification/node/node.c | 2 +- .../rpl-border-router/rpl-border-router.c | 4 ++-- .../rpl-border-router/slip-bridge.c | 4 ++-- .../tsch/uart1-test-node/uart1-test-node.c | 2 +- .../nrf52dk/coap-demo/coap-server.c | 2 +- .../nrf52dk/coap-demo/resources/res-leds.c | 2 +- .../nrf52dk/mqtt-demo/mqtt-demo.c | 2 +- .../zoul/orion/client/client.c | 2 +- .../zoul/orion/client/ifttt-client.c | 2 +- .../zoul/orion/ip64-router/ip64-router.c | 4 ++-- examples/trickle-library/trickle-library.c | 2 +- os/contiki-net.h | 20 +++++++++---------- os/dev/slip.c | 2 +- os/net/app-layer/http-socket/http-socket.c | 2 +- .../http-socket/websocket-http-client.c | 6 +++--- os/net/app-layer/mqtt/mqtt.c | 2 +- os/net/app-layer/mqtt/mqtt.h | 2 +- os/net/{ip => ipv6}/ip64-addr.c | 2 +- os/net/{ip => ipv6}/ip64-addr.h | 2 +- os/net/ipv6/multicast/esmrf.c | 4 ++-- os/net/ipv6/multicast/roll-tm.c | 2 +- os/net/ipv6/multicast/smrf.c | 2 +- os/net/ipv6/multicast/uip-mcast6-route.c | 2 +- os/net/ipv6/multicast/uip-mcast6-route.h | 2 +- os/net/{ip => ipv6}/psock.c | 2 +- os/net/{ip => ipv6}/psock.h | 0 os/net/{ip => ipv6}/resolv.c | 8 ++++---- os/net/{ip => ipv6}/resolv.h | 0 os/net/ipv6/sicslowpan.c | 4 ++-- os/net/ipv6/sicslowpan.h | 2 +- os/net/{ip => ipv6}/simple-udp.c | 2 +- os/net/{ip => ipv6}/simple-udp.h | 2 +- os/net/{ip => ipv6}/tcp-socket.c | 2 +- os/net/{ip => ipv6}/tcp-socket.h | 0 os/net/{ip => ipv6}/tcpip.c | 2 +- os/net/{ip => ipv6}/tcpip.h | 2 +- os/net/{ip => ipv6}/udp-socket.c | 0 os/net/{ip => ipv6}/udp-socket.h | 2 +- os/net/{ip => ipv6}/uip-arch.h | 2 +- os/net/{ip => ipv6}/uip-debug.c | 4 ++-- os/net/{ip => ipv6}/uip-debug.h | 2 +- os/net/ipv6/uip-ds6-nbr.h | 4 ++-- os/net/ipv6/uip-ds6-route.c | 2 +- os/net/ipv6/uip-ds6-route.h | 2 +- os/net/ipv6/uip-ds6.c | 2 +- os/net/ipv6/uip-ds6.h | 4 ++-- os/net/ipv6/uip-icmp6.h | 2 +- os/net/{ip => ipv6}/uip-nameserver.c | 0 os/net/{ip => ipv6}/uip-nameserver.h | 2 +- os/net/ipv6/uip-nd6.c | 2 +- os/net/ipv6/uip-nd6.h | 2 +- os/net/{ip => ipv6}/uip-packetqueue.c | 4 ++-- os/net/{ip => ipv6}/uip-packetqueue.h | 0 os/net/{ip => ipv6}/uip-udp-packet.c | 2 +- os/net/{ip => ipv6}/uip-udp-packet.h | 2 +- os/net/{ip => ipv6}/uip.h | 4 ++-- os/net/ipv6/uip6.c | 6 +++--- os/net/{ip => ipv6}/uiplib.c | 6 +++--- os/net/{ip => ipv6}/uiplib.h | 2 +- os/net/{ip => ipv6}/uipopt.h | 0 os/net/mac/llsec802154.h | 2 +- os/net/mac/nullmac/nullmac.c | 4 ++-- os/net/net-debug.h | 2 +- os/net/rpl-classic/rpl-dag-root.c | 2 +- os/net/rpl-classic/rpl-dag.c | 4 ++-- os/net/rpl-classic/rpl-ext-header.c | 6 +++--- os/net/rpl-classic/rpl-icmp6.c | 6 +++--- os/net/rpl-classic/rpl-mrhof.c | 2 +- os/net/rpl-classic/rpl-nbr-policy.c | 2 +- os/net/rpl-classic/rpl-ns.c | 6 +++--- os/net/rpl-classic/rpl-of0.c | 2 +- os/net/rpl-classic/rpl-private.h | 2 +- os/net/rpl-classic/rpl-timers.c | 2 +- os/net/rpl-classic/rpl.c | 6 +++--- os/net/rpl-classic/rpl.h | 2 +- os/net/rpl-lite/rpl-neighbor.h | 2 +- os/net/rpl-lite/rpl-ns.h | 2 +- os/net/rpl-lite/rpl.h | 2 +- os/{net => services}/ip64/README.md | 0 os/{net => services}/ip64/ip64-addrmap.c | 2 +- os/{net => services}/ip64/ip64-addrmap.h | 2 +- os/{net => services}/ip64/ip64-arp.c | 6 +++--- os/{net => services}/ip64/ip64-arp.h | 4 ++-- os/{net => services}/ip64/ip64-conf-example.h | 4 ++-- os/{net => services}/ip64/ip64-dhcpc.c | 4 ++-- os/{net => services}/ip64/ip64-dhcpc.h | 0 os/{net => services}/ip64/ip64-dns64.c | 6 +++--- os/{net => services}/ip64/ip64-dns64.h | 0 os/{net => services}/ip64/ip64-driver.h | 0 .../ip64/ip64-eth-interface.c | 10 +++++----- .../ip64/ip64-eth-interface.h | 2 +- os/{net => services}/ip64/ip64-eth.c | 2 +- os/{net => services}/ip64/ip64-eth.h | 0 os/{net => services}/ip64/ip64-interface.h | 0 os/{net => services}/ip64/ip64-ipv4-dhcp.c | 10 +++++----- os/{net => services}/ip64/ip64-ipv4-dhcp.h | 0 os/{net => services}/ip64/ip64-null-driver.c | 2 +- os/{net => services}/ip64/ip64-null-driver.h | 2 +- .../ip64/ip64-slip-interface.c | 6 +++--- .../ip64/ip64-slip-interface.h | 0 .../ip64/ip64-special-ports.c | 4 ++-- .../ip64/ip64-special-ports.h | 0 os/{net => services}/ip64/ip64.c | 18 ++++++++--------- os/{net => services}/ip64/ip64.h | 2 +- os/services/lwm2m/lwm2m-engine.c | 2 +- os/services/orchestra/orchestra.c | 2 +- os/services/shell/shell-commands.c | 4 ++-- os/services/shell/shell.c | 4 ++-- os/services/shell/shell.h | 2 +- os/services/slip-cmd/packetutils.c | 2 +- os/storage/antelope/aql-adt.c | 2 +- os/storage/antelope/aql-exec.c | 2 +- os/storage/antelope/index-inline.c | 2 +- os/storage/antelope/index-maxheap.c | 2 +- os/storage/antelope/index-memhash.c | 2 +- os/storage/antelope/index.c | 2 +- os/storage/antelope/relation.c | 2 +- os/storage/antelope/result.c | 2 +- os/storage/antelope/storage-cfs.c | 2 +- os/sys/log.c | 2 +- os/sys/log.h | 2 +- tests/08-ipv6/code-slip-radio/wait-dag.c | 4 ++-- tests/14-rpl-lite/code/receiver-node.c | 4 ++-- tests/14-rpl-lite/code/root-node.c | 4 ++-- tests/14-rpl-lite/code/sender-node.c | 4 ++-- tests/15-rpl-classic/code/receiver-node.c | 4 ++-- tests/15-rpl-classic/code/root-node.c | 4 ++-- tests/15-rpl-classic/code/sender-node.c | 4 ++-- tools/sky/uip6-bridge/dev/slip.c | 2 +- tools/sky/uip6-bridge/fakeuip.c | 2 +- tools/sky/uip6-bridge/uip6-bridge-tap.c | 2 +- tools/wpcapslip/net/tcpdump.h | 2 +- tools/wpcapslip/wpcap.c | 2 +- 200 files changed, 299 insertions(+), 299 deletions(-) rename os/net/{ip => ipv6}/ip64-addr.c (99%) rename os/net/{ip => ipv6}/ip64-addr.h (98%) rename os/net/{ip => ipv6}/psock.c (99%) rename os/net/{ip => ipv6}/psock.h (100%) rename os/net/{ip => ipv6}/resolv.c (99%) rename os/net/{ip => ipv6}/resolv.h (100%) rename os/net/{ip => ipv6}/simple-udp.c (99%) rename os/net/{ip => ipv6}/simple-udp.h (99%) rename os/net/{ip => ipv6}/tcp-socket.c (99%) rename os/net/{ip => ipv6}/tcp-socket.h (100%) rename os/net/{ip => ipv6}/tcpip.c (99%) rename os/net/{ip => ipv6}/tcpip.h (99%) rename os/net/{ip => ipv6}/udp-socket.c (100%) rename os/net/{ip => ipv6}/udp-socket.h (99%) rename os/net/{ip => ipv6}/uip-arch.h (99%) rename os/net/{ip => ipv6}/uip-debug.c (98%) rename os/net/{ip => ipv6}/uip-debug.h (98%) rename os/net/{ip => ipv6}/uip-nameserver.c (100%) rename os/net/{ip => ipv6}/uip-nameserver.h (99%) rename os/net/{ip => ipv6}/uip-packetqueue.c (97%) rename os/net/{ip => ipv6}/uip-packetqueue.h (100%) rename os/net/{ip => ipv6}/uip-udp-packet.c (98%) rename os/net/{ip => ipv6}/uip-udp-packet.h (98%) rename os/net/{ip => ipv6}/uip.h (99%) rename os/net/{ip => ipv6}/uiplib.c (97%) rename os/net/{ip => ipv6}/uiplib.h (99%) rename os/net/{ip => ipv6}/uipopt.h (100%) rename os/{net => services}/ip64/README.md (100%) rename os/{net => services}/ip64/ip64-addrmap.c (99%) rename os/{net => services}/ip64/ip64-addrmap.h (99%) rename os/{net => services}/ip64/ip64-arp.c (99%) rename os/{net => services}/ip64/ip64-arp.h (98%) rename os/{net => services}/ip64/ip64-conf-example.h (96%) rename os/{net => services}/ip64/ip64-dhcpc.c (99%) rename os/{net => services}/ip64/ip64-dhcpc.h (100%) rename os/{net => services}/ip64/ip64-dns64.c (99%) rename os/{net => services}/ip64/ip64-dns64.h (100%) rename os/{net => services}/ip64/ip64-driver.h (100%) rename os/{net => services}/ip64/ip64-eth-interface.c (96%) rename os/{net => services}/ip64/ip64-eth-interface.h (98%) rename os/{net => services}/ip64/ip64-eth.c (98%) rename os/{net => services}/ip64/ip64-eth.h (100%) rename os/{net => services}/ip64/ip64-interface.h (100%) rename os/{net => services}/ip64/ip64-ipv4-dhcp.c (96%) rename os/{net => services}/ip64/ip64-ipv4-dhcp.h (100%) rename os/{net => services}/ip64/ip64-null-driver.c (98%) rename os/{net => services}/ip64/ip64-null-driver.h (98%) rename os/{net => services}/ip64/ip64-slip-interface.c (98%) rename os/{net => services}/ip64/ip64-slip-interface.h (100%) rename os/{net => services}/ip64/ip64-special-ports.c (97%) rename os/{net => services}/ip64/ip64-special-ports.h (100%) rename os/{net => services}/ip64/ip64.c (99%) rename os/{net => services}/ip64/ip64.h (99%) diff --git a/Makefile.include b/Makefile.include index 867cc8282..031a800f7 100644 --- a/Makefile.include +++ b/Makefile.include @@ -120,7 +120,7 @@ ifeq ($(MAKE_NET),MAKE_NET_IPV6) CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1 CONTIKI_WITH_RPL ?= 1 CONTIKI_WITH_RPL_LITE ?= 1 - MODULES += os/net/ipv6 os/net/ip + MODULES += os/net/ipv6 else CFLAGS += -DNETSTACK_CONF_WITH_NULLNET=1 MODULES += os/net/nullnet @@ -170,6 +170,10 @@ else include $(target_makefile) endif +ifeq ($(WITH_IP64),1) + MODULES += os/services/ip64 +endif + ifdef MODULES UNIQUEMODULES = $(call uniq,$(MODULES)) MODULEDIRS = ${wildcard ${addprefix $(CONTIKI)/, $(UNIQUEMODULES)}} diff --git a/arch/cpu/msp430/uip-ipchksum.c b/arch/cpu/msp430/uip-ipchksum.c index 9f12a6749..e4cb308d0 100644 --- a/arch/cpu/msp430/uip-ipchksum.c +++ b/arch/cpu/msp430/uip-ipchksum.c @@ -35,7 +35,7 @@ * uIP checksum calculation for MSP430 */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #define asmv(arg) __asm__ __volatile__(arg) /*---------------------------------------------------------------------------*/ diff --git a/arch/cpu/native/net/tapdev-drv.c b/arch/cpu/native/net/tapdev-drv.c index 334f8d99a..52cb53343 100644 --- a/arch/cpu/native/net/tapdev-drv.c +++ b/arch/cpu/native/net/tapdev-drv.c @@ -31,8 +31,8 @@ */ #include "contiki-net.h" -#include "net/ip/uip.h" -#include "net/ip/uipopt.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uipopt.h" #if NETSTACK_CONF_WITH_IPV6 #include "tapdev6.h" diff --git a/arch/cpu/native/net/tapdev.c b/arch/cpu/native/net/tapdev.c index b60cd1946..ede3160c4 100644 --- a/arch/cpu/native/net/tapdev.c +++ b/arch/cpu/native/net/tapdev.c @@ -33,8 +33,8 @@ * */ -#include "net/ip/uip.h" -#include "net/ip/uipopt.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uipopt.h" #if !NETSTACK_CONF_WITH_IPV6 diff --git a/arch/cpu/native/net/tapdev6.c b/arch/cpu/native/net/tapdev6.c index 387e08da1..ed4eb20db 100644 --- a/arch/cpu/native/net/tapdev6.c +++ b/arch/cpu/native/net/tapdev6.c @@ -33,8 +33,8 @@ * */ -#include "net/ip/uip.h" -#include "net/ip/uipopt.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uipopt.h" #if NETSTACK_CONF_WITH_IPV6 diff --git a/arch/cpu/nrf52832/ble/ble-mac.c b/arch/cpu/nrf52832/ble/ble-mac.c index 94f7d62a9..4fe1ef934 100644 --- a/arch/cpu/nrf52832/ble/ble-mac.c +++ b/arch/cpu/nrf52832/ble/ble-mac.c @@ -46,8 +46,8 @@ #include "net/mac/nullmac/nullmac.h" #include "net/netstack.h" -#include "net/ip/uip.h" -#include "net/ip/tcpip.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/tcpip.h" #include "net/packetbuf.h" #include "net/netstack.h" #include "net/linkaddr.h" diff --git a/arch/dev/enc28j60/enc28j60-ip64-driver.c b/arch/dev/enc28j60/enc28j60-ip64-driver.c index 622aad71f..a3ed19e35 100644 --- a/arch/dev/enc28j60/enc28j60-ip64-driver.c +++ b/arch/dev/enc28j60/enc28j60-ip64-driver.c @@ -34,8 +34,8 @@ #include "enc28j60-ip64-driver.h" #include "linkaddr.h" -#include "ip64.h" -#include "ip64-eth.h" +#include "ip64/ip64.h" +#include "ip64/ip64-eth.h" #include #include diff --git a/arch/dev/enc28j60/enc28j60-ip64-driver.h b/arch/dev/enc28j60/enc28j60-ip64-driver.h index 29d3ed5a4..aba56b635 100644 --- a/arch/dev/enc28j60/enc28j60-ip64-driver.h +++ b/arch/dev/enc28j60/enc28j60-ip64-driver.h @@ -32,7 +32,7 @@ #ifndef ENC28J60_IP64_DRIVER_H #define ENC28J60_IP64_DRIVER_H -#include "ip64-driver.h" +#include "ip64/ip64-driver.h" extern const struct ip64_driver enc28j60_ip64_driver; #endif /* ENC28J60_IP64_DRIVER_H */ diff --git a/arch/platform/cc2538dk/contiki-main.c b/arch/platform/cc2538dk/contiki-main.c index 31c186974..3058b6257 100644 --- a/arch/platform/cc2538dk/contiki-main.c +++ b/arch/platform/cc2538dk/contiki-main.c @@ -60,8 +60,8 @@ #include "lib/random.h" #include "net/netstack.h" #include "net/queuebuf.h" -#include "net/ip/tcpip.h" -#include "net/ip/uip.h" +#include "net/ipv6/tcpip.h" +#include "net/ipv6/uip.h" #include "net/mac/framer/frame802154.h" #include "soc.h" #include "cpu.h" diff --git a/arch/platform/cooja-ip64/Makefile.cooja-ip64 b/arch/platform/cooja-ip64/Makefile.cooja-ip64 index b5dbec101..f36b94c85 100644 --- a/arch/platform/cooja-ip64/Makefile.cooja-ip64 +++ b/arch/platform/cooja-ip64/Makefile.cooja-ip64 @@ -1,6 +1,6 @@ COOJAPLATFORMDIR=$(CONTIKI)/arch/platform/cooja -MODULES += os/net/ip64 +WITH_IP64 = 1 include $(COOJAPLATFORMDIR)/Makefile.cooja vpath %.c $(COOJAPLATFORMDIR) $(COOJAPLATFORMDIR)/dev \ diff --git a/arch/platform/cooja-ip64/contiki-cooja-ip64-main.c b/arch/platform/cooja-ip64/contiki-cooja-ip64-main.c index 13d37ca5e..e4b7c0d3d 100644 --- a/arch/platform/cooja-ip64/contiki-cooja-ip64-main.c +++ b/arch/platform/cooja-ip64/contiki-cooja-ip64-main.c @@ -51,8 +51,8 @@ #include "net/netstack.h" #include "net/queuebuf.h" -#include "net/ip/uip-nameserver.h" -#include "net/ip/ip64-addr.h" +#include "net/ipv6/uip-nameserver.h" +#include "net/ipv6/ip64-addr.h" #include "dev/serial-line.h" #include "dev/cooja-radio.h" @@ -63,7 +63,7 @@ #include "sys/node-id.h" -#include "ip64.h" +#include "ip64/ip64.h" #include "dev/slip.h" void log_set_putchar_with_slip(int with); @@ -81,7 +81,7 @@ void log_set_putchar_with_slip(int with); #define Java_org_contikios_cooja_corecomm_CLASSNAME_tick COOJA__QUOTEME(COOJA_JNI_PATH,CLASSNAME,_tick) #define Java_org_contikios_cooja_corecomm_CLASSNAME_setReferenceAddress COOJA__QUOTEME(COOJA_JNI_PATH,CLASSNAME,_setReferenceAddress) -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #define PRINT6ADDR(addr) printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15]) diff --git a/arch/platform/cooja-ip64/ip64-conf.h b/arch/platform/cooja-ip64/ip64-conf.h index 376614abe..6b8948efb 100644 --- a/arch/platform/cooja-ip64/ip64-conf.h +++ b/arch/platform/cooja-ip64/ip64-conf.h @@ -34,8 +34,8 @@ #undef UIP_FALLBACK_INTERFACE #define UIP_FALLBACK_INTERFACE ip64_uip_fallback_interface -#include "ip64-slip-interface.h" -#include "ip64-null-driver.h" +#include "ip64/ip64-slip-interface.h" +#include "ip64/ip64-null-driver.h" #define IP64_CONF_UIP_FALLBACK_INTERFACE_SLIP 1 #define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_slip_interface diff --git a/arch/platform/cooja/Makefile.cooja b/arch/platform/cooja/Makefile.cooja index 6ed3160bc..dd6d9fada 100644 --- a/arch/platform/cooja/Makefile.cooja +++ b/arch/platform/cooja/Makefile.cooja @@ -41,7 +41,7 @@ JNILIB = $(OBJECTDIR)/$(LIBNAME).$(TARGET) CONTIKI_APP_OBJ = $(CONTIKI_APP).co # Modules -MODULES += os/net os/net/mac os/net/mac/framer os/net/ip64-addr +MODULES += os/net os/net/mac os/net/mac/framer ## Copied from Makefile.include, since Cooja overrides CFLAGS et al MAKE_NET_NULLNET = 0 @@ -55,7 +55,7 @@ ifeq ($(MAKE_NET),MAKE_NET_IPV6) CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1 CONTIKI_WITH_RPL ?= 1 CONTIKI_WITH_RPL_LITE ?= 1 - MODULES += os/net/ipv6 os/net/ip + MODULES += os/net/ipv6 COOJA_NET = uip-driver.c else COOJA_NET = diff --git a/arch/platform/cooja/contiki-cooja-main.c b/arch/platform/cooja/contiki-cooja-main.c index 625cf6896..278031ef2 100644 --- a/arch/platform/cooja/contiki-cooja-main.c +++ b/arch/platform/cooja/contiki-cooja-main.c @@ -80,7 +80,7 @@ #define NETSTACK_CONF_WITH_IPV6 0 #endif #if NETSTACK_CONF_WITH_IPV6 -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #define PRINT6ADDR(addr) printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15]) #endif /* NETSTACK_CONF_WITH_IPV6 */ diff --git a/arch/platform/cooja/dev/ip.c b/arch/platform/cooja/dev/ip.c index 743733a48..7e942215c 100644 --- a/arch/platform/cooja/dev/ip.c +++ b/arch/platform/cooja/dev/ip.c @@ -31,7 +31,7 @@ #include "dev/ip.h" #include "lib/simEnvChange.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" const struct simInterface ip_interface; diff --git a/arch/platform/cooja/net/uip-driver.c b/arch/platform/cooja/net/uip-driver.c index eed0be48d..e1829a9bd 100644 --- a/arch/platform/cooja/net/uip-driver.c +++ b/arch/platform/cooja/net/uip-driver.c @@ -37,8 +37,8 @@ */ #include "net/netstack.h" -#include "net/ip/uip.h" -#include "net/ip/tcpip.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/tcpip.h" #include "net/packetbuf.h" #include "net/uip-driver.h" #include diff --git a/arch/platform/cooja/testapps/testuip.c b/arch/platform/cooja/testapps/testuip.c index 727fdd26d..5f0017d9a 100644 --- a/arch/platform/cooja/testapps/testuip.c +++ b/arch/platform/cooja/testapps/testuip.c @@ -29,7 +29,7 @@ */ #include -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "dev/button-sensor.h" #include "dev/leds.h" diff --git a/arch/platform/jn516x/contiki-jn516x-main.c b/arch/platform/jn516x/contiki-jn516x-main.c index 9bad2288e..7c8acb67a 100644 --- a/arch/platform/jn516x/contiki-jn516x-main.c +++ b/arch/platform/jn516x/contiki-jn516x-main.c @@ -57,7 +57,7 @@ #include "dev/serial-line.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "dev/leds.h" #include "lib/random.h" diff --git a/arch/platform/jn516x/dev/micromac-radio.c b/arch/platform/jn516x/dev/micromac-radio.c index 5fa54462a..6e221c72f 100644 --- a/arch/platform/jn516x/dev/micromac-radio.c +++ b/arch/platform/jn516x/dev/micromac-radio.c @@ -60,7 +60,7 @@ * and acknowledging in software. */ #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifdef MICROMAC_CONF_RADIO_MAC #define MICROMAC_RADIO_MAC MICROMAC_CONF_RADIO_MAC diff --git a/arch/platform/jn516x/lib/slip.c b/arch/platform/jn516x/lib/slip.c index ed45da580..8e66c5f66 100644 --- a/arch/platform/jn516x/lib/slip.c +++ b/arch/platform/jn516x/lib/slip.c @@ -45,7 +45,7 @@ #include "contiki.h" #include -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #include "dev/slip.h" diff --git a/arch/platform/native/Makefile.native b/arch/platform/native/Makefile.native index d2a08bb54..88a33eba9 100644 --- a/arch/platform/native/Makefile.native +++ b/arch/platform/native/Makefile.native @@ -45,4 +45,4 @@ CURSES_LIBS ?= -lncurses TARGET_LIBFILES += $(CURSES_LIBS) -MODULES+=os/net os/net/mac os/net/mac/framer os/net/ip64-addr/ +MODULES+=os/net os/net/mac os/net/mac/framer diff --git a/arch/platform/native/contiki-main.c b/arch/platform/native/contiki-main.c index f480d11e0..e84ada71f 100644 --- a/arch/platform/native/contiki-main.c +++ b/arch/platform/native/contiki-main.c @@ -57,7 +57,7 @@ #include "dev/serial-line.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/queuebuf.h" #include "dev/button-sensor.h" diff --git a/arch/platform/openmote-cc2538/contiki-main.c b/arch/platform/openmote-cc2538/contiki-main.c index 6b5e09b89..4afb4212b 100644 --- a/arch/platform/openmote-cc2538/contiki-main.c +++ b/arch/platform/openmote-cc2538/contiki-main.c @@ -63,8 +63,8 @@ #include "lib/random.h" #include "net/netstack.h" #include "net/queuebuf.h" -#include "net/ip/tcpip.h" -#include "net/ip/uip.h" +#include "net/ipv6/tcpip.h" +#include "net/ipv6/uip.h" #include "net/mac/framer/frame802154.h" #include "soc.h" #include "cpu.h" diff --git a/arch/platform/zoul/Makefile.zoul b/arch/platform/zoul/Makefile.zoul index 75cd21aa4..b4610eb8d 100644 --- a/arch/platform/zoul/Makefile.zoul +++ b/arch/platform/zoul/Makefile.zoul @@ -49,10 +49,6 @@ MODULES += os/net os/net/mac os/net/mac/framer \ arch/dev/cc1200 \ os/storage/cfs -ifeq ($(WITH_IP64),1) - MODULES += os/net/ip64 -endif - BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py ### Use the specific Zoul subplatform to query for connected devices diff --git a/arch/platform/zoul/contiki-main.c b/arch/platform/zoul/contiki-main.c index 0e6bdb539..42e832352 100644 --- a/arch/platform/zoul/contiki-main.c +++ b/arch/platform/zoul/contiki-main.c @@ -62,8 +62,8 @@ #include "lib/random.h" #include "net/netstack.h" #include "net/queuebuf.h" -#include "net/ip/tcpip.h" -#include "net/ip/uip.h" +#include "net/ipv6/tcpip.h" +#include "net/ipv6/uip.h" #include "net/mac/framer/frame802154.h" #include "soc.h" #include "cpu.h" diff --git a/arch/platform/zoul/orion/ip64-conf.h b/arch/platform/zoul/orion/ip64-conf.h index c4052dfda..5201ded4c 100644 --- a/arch/platform/zoul/orion/ip64-conf.h +++ b/arch/platform/zoul/orion/ip64-conf.h @@ -34,7 +34,7 @@ #ifndef IP64_CONF_H #define IP64_CONF_H /*---------------------------------------------------------------------------*/ -#include "ip64-eth-interface.h" +#include "ip64/ip64-eth-interface.h" /*---------------------------------------------------------------------------*/ #define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_eth_interface #define IP64_CONF_INPUT ip64_eth_interface_input diff --git a/examples/http-socket/http-example.c b/examples/http-socket/http-example.c index 21aff094d..2891bff88 100644 --- a/examples/http-socket/http-example.c +++ b/examples/http-socket/http-example.c @@ -1,6 +1,6 @@ #include "contiki-net.h" #include "http-socket.h" -#include "ip64-addr.h" +#include "ipv6/ip64-addr.h" #include diff --git a/examples/ip64-router/ip64-router.c b/examples/ip64-router/ip64-router.c index 05fecfef7..a6a5af450 100644 --- a/examples/ip64-router/ip64-router.c +++ b/examples/ip64-router/ip64-router.c @@ -1,6 +1,6 @@ #include "contiki.h" #include "contiki-net.h" -#include "ip64.h" +#include "ip64/ip64.h" #include "net/netstack.h" #include "rpl-dag-root.h" #include "sys/autostart.h" diff --git a/examples/ipso-objects/example-ipso-objects.c b/examples/ipso-objects/example-ipso-objects.c index b9802f2a4..180369076 100644 --- a/examples/ipso-objects/example-ipso-objects.c +++ b/examples/ipso-objects/example-ipso-objects.c @@ -41,7 +41,7 @@ #include "services/ipso-objects/ipso-objects.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifndef REGISTER_WITH_LWM2M_BOOTSTRAP_SERVER #define REGISTER_WITH_LWM2M_BOOTSTRAP_SERVER 0 diff --git a/examples/ipso-objects/example-server.c b/examples/ipso-objects/example-server.c index cc0c46189..3a78dc7fc 100644 --- a/examples/ipso-objects/example-server.c +++ b/examples/ipso-objects/example-server.c @@ -37,7 +37,7 @@ */ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "rpl.h" #include "rpl-dag-root.h" #include "net/netstack.h" @@ -53,7 +53,7 @@ #endif #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define REMOTE_PORT UIP_HTONS(COAP_DEFAULT_PORT) diff --git a/examples/ipso-objects/serial-protocol.c b/examples/ipso-objects/serial-protocol.c index f0c2cb1a0..bc59294f6 100644 --- a/examples/ipso-objects/serial-protocol.c +++ b/examples/ipso-objects/serial-protocol.c @@ -36,8 +36,8 @@ */ #include "contiki.h" -#include "net/ip/uip.h" -#include "net/ip/uiplib.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uiplib.h" #include void print_node_list(void); diff --git a/examples/ipv6/json-ws/json-ws-udp.c b/examples/ipv6/json-ws/json-ws-udp.c index 73112b8a6..8f46f6cb2 100644 --- a/examples/ipv6/json-ws/json-ws-udp.c +++ b/examples/ipv6/json-ws/json-ws-udp.c @@ -48,7 +48,7 @@ #include #define DEBUG DEBUG_FULL -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static struct uip_udp_conn *client_conn; static uip_ipaddr_t server_ipaddr; diff --git a/examples/ipv6/multicast/root.c b/examples/ipv6/multicast/root.c index f98125a17..b4bf9dcdb 100644 --- a/examples/ipv6/multicast/root.c +++ b/examples/ipv6/multicast/root.c @@ -47,7 +47,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "rpl.h" #include "rpl-dag-root.h" diff --git a/examples/ipv6/multicast/sink.c b/examples/ipv6/multicast/sink.c index 4e795e9de..e15d0f695 100644 --- a/examples/ipv6/multicast/sink.c +++ b/examples/ipv6/multicast/sink.c @@ -48,7 +48,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define MCAST_SINK_UDP_PORT 3001 /* Host byte order */ diff --git a/examples/ipv6/native-border-router/border-router-cmds.c b/examples/ipv6/native-border-router/border-router-cmds.c index 25bdbe3a1..70f1739d7 100644 --- a/examples/ipv6/native-border-router/border-router-cmds.c +++ b/examples/ipv6/native-border-router/border-router-cmds.c @@ -41,11 +41,11 @@ #include "border-router-cmds.h" #include "dev/serial-line.h" #include "rpl.h" -#include "net/ip/uiplib.h" +#include "net/ipv6/uiplib.h" #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" uint8_t command_context; diff --git a/examples/ipv6/native-border-router/border-router.c b/examples/ipv6/native-border-router/border-router.c index ac02647b8..7db74241b 100644 --- a/examples/ipv6/native-border-router/border-router.c +++ b/examples/ipv6/native-border-router/border-router.c @@ -41,7 +41,7 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "rpl.h" #include "rpl-dag-root.h" @@ -58,7 +58,7 @@ #include #define DEBUG DEBUG_FULL -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define MAX_SENSORS 4 diff --git a/examples/ipv6/native-border-router/border-router.h b/examples/ipv6/native-border-router/border-router.h index 68420320d..91c405315 100644 --- a/examples/ipv6/native-border-router/border-router.h +++ b/examples/ipv6/native-border-router/border-router.h @@ -38,7 +38,7 @@ #define BORDER_ROUTER_H_ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include int border_router_cmd_handler(const uint8_t *data, int len); diff --git a/examples/ipv6/native-border-router/tun-bridge.c b/examples/ipv6/native-border-router/tun-bridge.c index 711f17dec..191fc3983 100644 --- a/examples/ipv6/native-border-router/tun-bridge.c +++ b/examples/ipv6/native-border-router/tun-bridge.c @@ -33,7 +33,7 @@ * Joakim Eriksson */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include #include @@ -52,7 +52,7 @@ #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifdef linux #include diff --git a/examples/ipv6/rpl-border-router/border-router.c b/examples/ipv6/rpl-border-router/border-router.c index d6690bf83..ab3dc8086 100644 --- a/examples/ipv6/rpl-border-router/border-router.c +++ b/examples/ipv6/rpl-border-router/border-router.c @@ -38,7 +38,7 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "rpl.h" #if UIP_CONF_IPV6_RPL_LITE == 0 @@ -58,7 +58,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static uip_ipaddr_t prefix; static uint8_t prefix_set; diff --git a/examples/ipv6/rpl-border-router/slip-bridge.c b/examples/ipv6/rpl-border-router/slip-bridge.c index 62940d5ef..db32fa44b 100644 --- a/examples/ipv6/rpl-border-router/slip-bridge.c +++ b/examples/ipv6/rpl-border-router/slip-bridge.c @@ -38,7 +38,7 @@ * Nicolas Tsiftes */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/slip.h" #include "dev/uart1.h" @@ -47,7 +47,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" void set_prefix_64(uip_ipaddr_t *); diff --git a/examples/ipv6/rpl-simple/node.c b/examples/ipv6/rpl-simple/node.c index 4c3cc0004..8f94c2d78 100644 --- a/examples/ipv6/rpl-simple/node.c +++ b/examples/ipv6/rpl-simple/node.c @@ -30,9 +30,9 @@ #include "contiki.h" #include "lib/random.h" #include "sys/ctimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip-udp-packet.h" +#include "net/ipv6/uip-udp-packet.h" #include "rpl.h" #include "rpl-dag-root.h" #include "node-id.h" diff --git a/examples/ipv6/rpl-tsch-sixtop/node-sixtop.c b/examples/ipv6/rpl-tsch-sixtop/node-sixtop.c index 6452a51d8..f3a6b3b13 100755 --- a/examples/ipv6/rpl-tsch-sixtop/node-sixtop.c +++ b/examples/ipv6/rpl-tsch-sixtop/node-sixtop.c @@ -45,7 +45,7 @@ #include "net/mac/tsch/tsch-schedule.h" #include "net/mac/tsch/sixtop/sixtop.h" #include "net/rpl/rpl-private.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "sf-simple.h" diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c index 36e67dc6d..297c46637 100644 --- a/examples/ipv6/rpl-tsch/node.c +++ b/examples/ipv6/rpl-tsch/node.c @@ -55,7 +55,7 @@ #endif /* WITH_SHELL */ #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*---------------------------------------------------------------------------*/ PROCESS(node_process, "RPL Node"); diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c index 9c226f134..c09a52727 100644 --- a/examples/ipv6/rpl-udp/udp-client.c +++ b/examples/ipv6/rpl-udp/udp-client.c @@ -30,9 +30,9 @@ #include "contiki.h" #include "lib/random.h" #include "sys/ctimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip-udp-packet.h" +#include "net/ipv6/uip-udp-packet.h" #include "sys/ctimer.h" #include #include @@ -46,7 +46,7 @@ #define UDP_EXAMPLE_ID 190 #define DEBUG DEBUG_FULL -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifndef PERIOD #define PERIOD 60 diff --git a/examples/ipv6/rpl-udp/udp-server.c b/examples/ipv6/rpl-udp/udp-server.c index 0495bcfde..a3119460b 100644 --- a/examples/ipv6/rpl-udp/udp-server.c +++ b/examples/ipv6/rpl-udp/udp-server.c @@ -30,7 +30,7 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "rpl.h" #include "rpl-dag-root.h" @@ -42,7 +42,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/examples/ipv6/slip-radio/Makefile b/examples/ipv6/slip-radio/Makefile index eafd90864..2c8d612e6 100644 --- a/examples/ipv6/slip-radio/Makefile +++ b/examples/ipv6/slip-radio/Makefile @@ -21,5 +21,5 @@ endif MAKE_NET = MAKE_NET_OTHER CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1 CONTIKI_WITH_RPL = 0 -MODULES += os/net/ipv6 os/net/ip +MODULES += os/net/ipv6 include $(CONTIKI)/Makefile.include diff --git a/examples/ipv6/slip-radio/slip-net.c b/examples/ipv6/slip-radio/slip-net.c index 1482aefed..bb162ea9b 100644 --- a/examples/ipv6/slip-radio/slip-net.c +++ b/examples/ipv6/slip-radio/slip-net.c @@ -29,7 +29,7 @@ #include "contiki.h" #include "net/netstack.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/packetbuf.h" #include "dev/slip.h" #include diff --git a/examples/ipv6/slip-radio/slip-radio.c b/examples/ipv6/slip-radio/slip-radio.c index ba7969685..04a60930e 100644 --- a/examples/ipv6/slip-radio/slip-radio.c +++ b/examples/ipv6/slip-radio/slip-radio.c @@ -35,7 +35,7 @@ * Joakim Eriksson */ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/slip.h" #include @@ -43,7 +43,7 @@ #include "net/packetbuf.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "cmd.h" #include "slip-radio.h" #include "packetutils.h" diff --git a/examples/ipv6/udp-ipv6/udp-client.c b/examples/ipv6/udp-ipv6/udp-client.c index 85854a48b..dc53dada3 100644 --- a/examples/ipv6/udp-ipv6/udp-client.c +++ b/examples/ipv6/udp-ipv6/udp-client.c @@ -30,13 +30,13 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/ip/resolv.h" +#include "net/ipv6/resolv.h" #include #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define SEND_INTERVAL 15 * CLOCK_SECOND #define MAX_PAYLOAD_LEN 40 diff --git a/examples/ipv6/udp-ipv6/udp-server.c b/examples/ipv6/udp-ipv6/udp-server.c index eeb7de700..a5784dd0c 100644 --- a/examples/ipv6/udp-ipv6/udp-server.c +++ b/examples/ipv6/udp-ipv6/udp-server.c @@ -34,7 +34,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c b/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c index 93294ee56..18b806ac9 100644 --- a/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c +++ b/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c @@ -47,7 +47,7 @@ #endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ #include "mqtt.h" #include "rpl.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-icmp6.h" #include "net/ipv6/sicslowpan.h" #include "sys/etimer.h" diff --git a/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c b/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c index 22670ffed..b7f698169 100644 --- a/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c +++ b/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c @@ -47,7 +47,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "dev/watchdog.h" #include "dev/leds.h" #include "rpl.h" diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c index 47c44720f..e12f2cd16 100644 --- a/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c +++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c @@ -36,13 +36,13 @@ #include "contiki-lib.h" #include "contiki-net.h" #include "rpl.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include #include /*---------------------------------------------------------------------------*/ #define DEBUG 0 -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*---------------------------------------------------------------------------*/ #ifndef CETIC_6LBR_NODE_INFO_PORT #define CETIC_6LBR_NODE_INFO_PORT 3000 diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c index 2f0b04b05..59ecee1ce 100644 --- a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c +++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c @@ -41,7 +41,7 @@ #endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ #include "mqtt.h" #include "rpl.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-icmp6.h" #include "sys/etimer.h" #include "sys/ctimer.h" diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c index 07a7590c2..f3dc146c9 100644 --- a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c +++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c @@ -60,9 +60,9 @@ #include "sys/process.h" #include "dev/serial-line.h" #include "dev/cc26xx-uart.h" -#include "net/ip/uip.h" -#include "net/ip/uip-udp-packet.h" -#include "net/ip/uiplib.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uip-udp-packet.h" +#include "net/ipv6/uiplib.h" #include "net-uart.h" #include "httpd-simple.h" #include "sys/cc.h" @@ -75,7 +75,7 @@ #include /*---------------------------------------------------------------------------*/ #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*---------------------------------------------------------------------------*/ #define REMOTE_PORT 7777 #define MAX_MSG_SIZE 100 diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h index 5c4201672..663e81eaa 100644 --- a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h +++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h @@ -30,7 +30,7 @@ #ifndef NET_UART_H_ #define NET_UART_H_ /*---------------------------------------------------------------------------*/ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include /*---------------------------------------------------------------------------*/ diff --git a/examples/platform-specific/jn516x/rpl/border-router/border-router.c b/examples/platform-specific/jn516x/rpl/border-router/border-router.c index 89db3b256..3e829b4cc 100644 --- a/examples/platform-specific/jn516x/rpl/border-router/border-router.c +++ b/examples/platform-specific/jn516x/rpl/border-router/border-router.c @@ -33,7 +33,7 @@ #include "tools/rpl-tools.h" #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static uip_ipaddr_t prefix; static uint8_t prefix_set; diff --git a/examples/platform-specific/jn516x/rpl/border-router/slip-bridge.c b/examples/platform-specific/jn516x/rpl/border-router/slip-bridge.c index a2721facd..e70a8541d 100644 --- a/examples/platform-specific/jn516x/rpl/border-router/slip-bridge.c +++ b/examples/platform-specific/jn516x/rpl/border-router/slip-bridge.c @@ -38,7 +38,7 @@ * Nicolas Tsiftes */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/slip.h" #if CONTIKI_TARGET_JN516X @@ -51,7 +51,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifndef BAUD2UBR #define BAUD2UBR(X) (X) diff --git a/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c b/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c index 233834610..1e3ab0842 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c +++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c @@ -32,7 +32,7 @@ * */ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "tools/rpl-tools.h" #include "rest-engine.h" diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c index 641f3eca5..2cd40c283 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c +++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c @@ -33,7 +33,7 @@ */ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "tools/rpl-tools.h" #include "rest-engine.h" diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c index 933b247d6..0309538ec 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c +++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c @@ -32,7 +32,7 @@ * */ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "tools/rpl-tools.h" #include "rest-engine.h" diff --git a/examples/platform-specific/jn516x/rpl/node/node.c b/examples/platform-specific/jn516x/rpl/node/node.c index a5b2bda4a..3c24f36c1 100644 --- a/examples/platform-specific/jn516x/rpl/node/node.c +++ b/examples/platform-specific/jn516x/rpl/node/node.c @@ -41,7 +41,7 @@ #include "tools/rpl-tools.h" #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define CONFIG_VIA_BUTTON PLATFORM_HAS_BUTTON #if CONFIG_VIA_BUTTON diff --git a/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c b/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c index 465fe2ae6..570be8566 100644 --- a/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c +++ b/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c @@ -35,14 +35,14 @@ #include "contiki.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "rpl.h" #include "rpl-dag-root.h" #include #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*---------------------------------------------------------------------------*/ void diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c index c96c1973b..0b1bc3414 100644 --- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c +++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c @@ -42,20 +42,20 @@ #include "rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ #include "net/mac/tsch/tsch-schedule.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "lib/random.h" #include "rpl-tools.h" #include "node-id.h" #include "waveform.h" #include "leds.h" -#include "net/ip/uiplib.h" -#include "net/ip/uip-udp-packet.h" +#include "net/ipv6/uiplib.h" +#include "net/ipv6/uip-udp-packet.h" #include #include #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c index 63ed70eab..df329a508 100644 --- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c +++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c @@ -38,7 +38,7 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "rpl.h" #include "simple-udp.h" @@ -54,7 +54,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static uip_ipaddr_t prefix; static uint8_t prefix_set; diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c index e4239a8e9..7436ee66a 100644 --- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c +++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c @@ -38,7 +38,7 @@ * Nicolas Tsiftes */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/slip.h" #if CONTIKI_TARGET_JN516X @@ -51,7 +51,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifndef BAUD2UBR #define BAUD2UBR(X) (X) diff --git a/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c b/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c index d961c8d7f..7973982ff 100644 --- a/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c +++ b/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c @@ -35,7 +35,7 @@ #include "contiki.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "rpl.h" #include "rpl-dag-root.h" #include "orchestra.h" @@ -43,7 +43,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" void print_network_status(void) diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c index 85b19fa10..115649535 100644 --- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c +++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c @@ -34,7 +34,7 @@ #include "contiki.h" #include "net/ipv6/uip-ds6.h" #include "net/netstack.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/linkaddr.h" #include "rpl-tools.h" #include "rest-engine.h" diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c index 3bef0fd9d..e15a77989 100644 --- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c +++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c @@ -34,7 +34,7 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "rpl.h" #include "simple-udp.h" @@ -51,7 +51,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static uip_ipaddr_t prefix; static uint8_t prefix_set; diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c index e4239a8e9..7436ee66a 100644 --- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c +++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c @@ -38,7 +38,7 @@ * Nicolas Tsiftes */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/slip.h" #if CONTIKI_TARGET_JN516X @@ -51,7 +51,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifndef BAUD2UBR #define BAUD2UBR(X) (X) diff --git a/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c b/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c index 4accd3dc4..244672d48 100644 --- a/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c +++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c @@ -33,7 +33,7 @@ */ #include "contiki.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/linkaddr.h" #include "rpl-tools.h" #include "rest-engine.h" diff --git a/examples/platform-specific/nrf52dk/coap-demo/coap-server.c b/examples/platform-specific/nrf52dk/coap-demo/coap-server.c index 9bab7e60d..9df517886 100644 --- a/examples/platform-specific/nrf52dk/coap-demo/coap-server.c +++ b/examples/platform-specific/nrf52dk/coap-demo/coap-server.c @@ -57,7 +57,7 @@ #include "dev/leds.h" #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* * Resources to be activated need to be imported through the extern keyword. diff --git a/examples/platform-specific/nrf52dk/coap-demo/resources/res-leds.c b/examples/platform-specific/nrf52dk/coap-demo/resources/res-leds.c index 468a165bf..f990fcf38 100644 --- a/examples/platform-specific/nrf52dk/coap-demo/resources/res-leds.c +++ b/examples/platform-specific/nrf52dk/coap-demo/resources/res-leds.c @@ -44,7 +44,7 @@ #include "dev/leds.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static void res_post_put_handler(void *request, void *response, uint8_t *buffer, diff --git a/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c b/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c index 5b74a2613..80339a4ad 100644 --- a/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c +++ b/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c @@ -44,7 +44,7 @@ /*---------------------------------------------------------------------------*/ #include "contiki.h" #include "mqtt.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-icmp6.h" #include "net/ipv6/sicslowpan.h" #include "sys/etimer.h" diff --git a/examples/platform-specific/zoul/orion/client/client.c b/examples/platform-specific/zoul/orion/client/client.c index 3ccf1d69e..18f1a5e91 100644 --- a/examples/platform-specific/zoul/orion/client/client.c +++ b/examples/platform-specific/zoul/orion/client/client.c @@ -31,7 +31,7 @@ /*---------------------------------------------------------------------------*/ #include "contiki-net.h" #include "http-socket.h" -#include "ip64-addr.h" +#include "ipv6/ip64-addr.h" #include "dev/leds.h" #include "rpl.h" #include diff --git a/examples/platform-specific/zoul/orion/client/ifttt-client.c b/examples/platform-specific/zoul/orion/client/ifttt-client.c index 8da827e3a..ec1288753 100644 --- a/examples/platform-specific/zoul/orion/client/ifttt-client.c +++ b/examples/platform-specific/zoul/orion/client/ifttt-client.c @@ -31,7 +31,7 @@ /*---------------------------------------------------------------------------*/ #include "contiki-net.h" #include "http-socket.h" -#include "ip64-addr.h" +#include "ipv6/ip64-addr.h" #include "dev/leds.h" #include "rpl.h" #include "dev/button-sensor.h" diff --git a/examples/platform-specific/zoul/orion/ip64-router/ip64-router.c b/examples/platform-specific/zoul/orion/ip64-router/ip64-router.c index 5fe445b71..433f58426 100644 --- a/examples/platform-specific/zoul/orion/ip64-router/ip64-router.c +++ b/examples/platform-specific/zoul/orion/ip64-router/ip64-router.c @@ -43,12 +43,12 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "rpl.h" #include "rpl-dag-root.h" #include "dev/leds.h" -#include "ip64.h" +#include "ip64/ip64.h" #include "net/netstack.h" #include "httpd-simple.h" diff --git a/examples/trickle-library/trickle-library.c b/examples/trickle-library/trickle-library.c index 6d716066e..30e02caf0 100644 --- a/examples/trickle-library/trickle-library.c +++ b/examples/trickle-library/trickle-library.c @@ -42,7 +42,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* Trickle variables and constants */ static struct trickle_timer tt; diff --git a/os/contiki-net.h b/os/contiki-net.h index 519d4a795..9b467363f 100644 --- a/os/contiki-net.h +++ b/os/contiki-net.h @@ -36,24 +36,24 @@ #include "contiki.h" -#include "net/ip/tcpip.h" -#include "net/ip/uip.h" -#include "net/ip/uiplib.h" -#include "net/ip/uip-udp-packet.h" -#include "net/ip/simple-udp.h" -#include "net/ip/uip-nameserver.h" +#include "net/ipv6/tcpip.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uiplib.h" +#include "net/ipv6/uip-udp-packet.h" +#include "net/ipv6/simple-udp.h" +#include "net/ipv6/uip-nameserver.h" #if NETSTACK_CONF_WITH_IPV6 #include "net/ipv6/uip-icmp6.h" #include "net/ipv6/uip-ds6.h" #endif /* NETSTACK_CONF_WITH_IPV6 */ -#include "net/ip/resolv.h" +#include "net/ipv6/resolv.h" -#include "net/ip/psock.h" +#include "net/ipv6/psock.h" -#include "net/ip/udp-socket.h" -#include "net/ip/tcp-socket.h" +#include "net/ipv6/udp-socket.h" +#include "net/ipv6/tcp-socket.h" #include "net/netstack.h" diff --git a/os/dev/slip.c b/os/dev/slip.c index 58d443185..b27dca332 100644 --- a/os/dev/slip.c +++ b/os/dev/slip.c @@ -37,7 +37,7 @@ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #include "dev/slip.h" diff --git a/os/net/app-layer/http-socket/http-socket.c b/os/net/app-layer/http-socket/http-socket.c index a085d0954..dfcf9e2a4 100644 --- a/os/net/app-layer/http-socket/http-socket.c +++ b/os/net/app-layer/http-socket/http-socket.c @@ -29,7 +29,7 @@ * */ #include "contiki-net.h" -#include "ip64-addr.h" +#include "ipv6/ip64-addr.h" #include "http-socket.h" #include diff --git a/os/net/app-layer/http-socket/websocket-http-client.c b/os/net/app-layer/http-socket/websocket-http-client.c index 4c407c75e..a6cb4a8bd 100644 --- a/os/net/app-layer/http-socket/websocket-http-client.c +++ b/os/net/app-layer/http-socket/websocket-http-client.c @@ -30,10 +30,10 @@ */ #include "websocket-http-client.h" -#include "net/ip/uiplib.h" -#include "net/ip/resolv.h" +#include "net/ipv6/uiplib.h" +#include "net/ipv6/resolv.h" -#include "ip64-addr.h" +#include "ipv6/ip64-addr.h" #include #include diff --git a/os/net/app-layer/mqtt/mqtt.c b/os/net/app-layer/mqtt/mqtt.c index e20ab8c51..46a542c3f 100644 --- a/os/net/app-layer/mqtt/mqtt.c +++ b/os/net/app-layer/mqtt/mqtt.c @@ -48,7 +48,7 @@ #include "sys/ctimer.h" #include "sys/etimer.h" #include "sys/pt.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/leds.h" diff --git a/os/net/app-layer/mqtt/mqtt.h b/os/net/app-layer/mqtt/mqtt.h index 335fac2bb..6b7e8a3ed 100644 --- a/os/net/app-layer/mqtt/mqtt.h +++ b/os/net/app-layer/mqtt/mqtt.h @@ -89,7 +89,7 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/leds.h" diff --git a/os/net/ip/ip64-addr.c b/os/net/ipv6/ip64-addr.c similarity index 99% rename from os/net/ip/ip64-addr.c rename to os/net/ipv6/ip64-addr.c index 38ae04f1f..b472ee81b 100644 --- a/os/net/ip/ip64-addr.c +++ b/os/net/ipv6/ip64-addr.c @@ -29,7 +29,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#include "ip64-addr.h" +#include "ipv6/ip64-addr.h" #include #include diff --git a/os/net/ip/ip64-addr.h b/os/net/ipv6/ip64-addr.h similarity index 98% rename from os/net/ip/ip64-addr.h rename to os/net/ipv6/ip64-addr.h index 67f71b635..9e3b9d852 100644 --- a/os/net/ip/ip64-addr.h +++ b/os/net/ipv6/ip64-addr.h @@ -32,7 +32,7 @@ #ifndef IP64_ADDR_H #define IP64_ADDR_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" /** diff --git a/os/net/ipv6/multicast/esmrf.c b/os/net/ipv6/multicast/esmrf.c index 2666625c9..2da8da400 100644 --- a/os/net/ipv6/multicast/esmrf.c +++ b/os/net/ipv6/multicast/esmrf.c @@ -52,7 +52,7 @@ #include "net/rpl-classic/rpl.h" #include "net/rpl-classic/rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/netstack.h" #include "net/packetbuf.h" #include @@ -60,7 +60,7 @@ extern uint16_t uip_slen; #define DEBUG NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define ESMRF_VERBOSE NONE diff --git a/os/net/ipv6/multicast/roll-tm.c b/os/net/ipv6/multicast/roll-tm.c index a569063f9..edf86b22b 100644 --- a/os/net/ipv6/multicast/roll-tm.c +++ b/os/net/ipv6/multicast/roll-tm.c @@ -50,7 +50,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define TRICKLE_VERBOSE 0 diff --git a/os/net/ipv6/multicast/smrf.c b/os/net/ipv6/multicast/smrf.c index d13979307..06167f75a 100644 --- a/os/net/ipv6/multicast/smrf.c +++ b/os/net/ipv6/multicast/smrf.c @@ -57,7 +57,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*---------------------------------------------------------------------------*/ /* Macros */ diff --git a/os/net/ipv6/multicast/uip-mcast6-route.c b/os/net/ipv6/multicast/uip-mcast6-route.c index f6b9737fc..c1ca80479 100644 --- a/os/net/ipv6/multicast/uip-mcast6-route.c +++ b/os/net/ipv6/multicast/uip-mcast6-route.c @@ -43,7 +43,7 @@ #include "contiki.h" #include "lib/list.h" #include "lib/memb.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/multicast/uip-mcast6-route.h" #include diff --git a/os/net/ipv6/multicast/uip-mcast6-route.h b/os/net/ipv6/multicast/uip-mcast6-route.h index 95e808676..39facb8a8 100644 --- a/os/net/ipv6/multicast/uip-mcast6-route.h +++ b/os/net/ipv6/multicast/uip-mcast6-route.h @@ -43,7 +43,7 @@ #define UIP_MCAST6_ROUTE_H_ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include /*---------------------------------------------------------------------------*/ diff --git a/os/net/ip/psock.c b/os/net/ipv6/psock.c similarity index 99% rename from os/net/ip/psock.c rename to os/net/ipv6/psock.c index 5b662a827..6fa2ef461 100644 --- a/os/net/ip/psock.c +++ b/os/net/ipv6/psock.c @@ -34,7 +34,7 @@ #include -#include "net/ip/psock.h" +#include "net/ipv6/psock.h" #define STATE_NONE 0 #define STATE_ACKED 1 diff --git a/os/net/ip/psock.h b/os/net/ipv6/psock.h similarity index 100% rename from os/net/ip/psock.h rename to os/net/ipv6/psock.h diff --git a/os/net/ip/resolv.c b/os/net/ipv6/resolv.c similarity index 99% rename from os/net/ip/resolv.c rename to os/net/ipv6/resolv.c index feb6f3a77..f75a084a9 100644 --- a/os/net/ip/resolv.c +++ b/os/net/ipv6/resolv.c @@ -62,10 +62,10 @@ * function with the hostname. */ -#include "net/ip/tcpip.h" -#include "net/ip/resolv.h" -#include "net/ip/uip-udp-packet.h" -#include "net/ip/uip-nameserver.h" +#include "net/ipv6/tcpip.h" +#include "net/ipv6/resolv.h" +#include "net/ipv6/uip-udp-packet.h" +#include "net/ipv6/uip-nameserver.h" #include "lib/random.h" #ifndef DEBUG diff --git a/os/net/ip/resolv.h b/os/net/ipv6/resolv.h similarity index 100% rename from os/net/ip/resolv.h rename to os/net/ipv6/resolv.h diff --git a/os/net/ipv6/sicslowpan.c b/os/net/ipv6/sicslowpan.c index 5fea84aaf..4e7cca8c4 100644 --- a/os/net/ipv6/sicslowpan.c +++ b/os/net/ipv6/sicslowpan.c @@ -63,8 +63,8 @@ #include "contiki.h" #include "dev/watchdog.h" #include "net/link-stats.h" -#include "net/ip/tcpip.h" -#include "net/ip/uip.h" +#include "net/ipv6/tcpip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/sicslowpan.h" #include "net/netstack.h" diff --git a/os/net/ipv6/sicslowpan.h b/os/net/ipv6/sicslowpan.h index 11b861bd5..46cf6cc05 100644 --- a/os/net/ipv6/sicslowpan.h +++ b/os/net/ipv6/sicslowpan.h @@ -49,7 +49,7 @@ #ifndef SICSLOWPAN_H_ #define SICSLOWPAN_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/mac/mac.h" /** diff --git a/os/net/ip/simple-udp.c b/os/net/ipv6/simple-udp.c similarity index 99% rename from os/net/ip/simple-udp.c rename to os/net/ipv6/simple-udp.c index 692fea19a..c98107c99 100644 --- a/os/net/ip/simple-udp.c +++ b/os/net/ipv6/simple-udp.c @@ -43,7 +43,7 @@ */ #include "contiki-net.h" -#include "net/ip/simple-udp.h" +#include "net/ipv6/simple-udp.h" #include diff --git a/os/net/ip/simple-udp.h b/os/net/ipv6/simple-udp.h similarity index 99% rename from os/net/ip/simple-udp.h rename to os/net/ipv6/simple-udp.h index c28ce3e2c..212eb7885 100644 --- a/os/net/ip/simple-udp.h +++ b/os/net/ipv6/simple-udp.h @@ -55,7 +55,7 @@ #ifndef SIMPLE_UDP_H #define SIMPLE_UDP_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" struct simple_udp_connection; diff --git a/os/net/ip/tcp-socket.c b/os/net/ipv6/tcp-socket.c similarity index 99% rename from os/net/ip/tcp-socket.c rename to os/net/ipv6/tcp-socket.c index f709a3dfb..b2ec304a5 100644 --- a/os/net/ip/tcp-socket.c +++ b/os/net/ipv6/tcp-socket.c @@ -30,7 +30,7 @@ */ #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "contiki.h" #include "sys/cc.h" diff --git a/os/net/ip/tcp-socket.h b/os/net/ipv6/tcp-socket.h similarity index 100% rename from os/net/ip/tcp-socket.h rename to os/net/ipv6/tcp-socket.h diff --git a/os/net/ip/tcpip.c b/os/net/ipv6/tcpip.c similarity index 99% rename from os/net/ip/tcpip.c rename to os/net/ipv6/tcpip.c index a4c79f61c..bf8f46b9f 100644 --- a/os/net/ip/tcpip.c +++ b/os/net/ipv6/tcpip.c @@ -39,7 +39,7 @@ */ #include "contiki-net.h" -#include "net/ip/uip-packetqueue.h" +#include "net/ipv6/uip-packetqueue.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-ds6.h" diff --git a/os/net/ip/tcpip.h b/os/net/ipv6/tcpip.h similarity index 99% rename from os/net/ip/tcpip.h rename to os/net/ipv6/tcpip.h index b83ae81c2..feb06ff93 100644 --- a/os/net/ip/tcpip.h +++ b/os/net/ipv6/tcpip.h @@ -85,7 +85,7 @@ struct tcpip_uipstate { typedef struct tcpip_uipstate uip_udp_appstate_t; typedef struct tcpip_uipstate uip_tcp_appstate_t; typedef struct tcpip_uipstate uip_icmp6_appstate_t; -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" void tcpip_uipcall(void); /** diff --git a/os/net/ip/udp-socket.c b/os/net/ipv6/udp-socket.c similarity index 100% rename from os/net/ip/udp-socket.c rename to os/net/ipv6/udp-socket.c diff --git a/os/net/ip/udp-socket.h b/os/net/ipv6/udp-socket.h similarity index 99% rename from os/net/ip/udp-socket.h rename to os/net/ipv6/udp-socket.h index 0498bf892..d447a4508 100644 --- a/os/net/ip/udp-socket.h +++ b/os/net/ipv6/udp-socket.h @@ -32,7 +32,7 @@ #ifndef UDP_SOCKET_H #define UDP_SOCKET_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" struct udp_socket; diff --git a/os/net/ip/uip-arch.h b/os/net/ipv6/uip-arch.h similarity index 99% rename from os/net/ip/uip-arch.h rename to os/net/ipv6/uip-arch.h index 77a27684c..11fcf4e6c 100644 --- a/os/net/ip/uip-arch.h +++ b/os/net/ipv6/uip-arch.h @@ -60,7 +60,7 @@ #ifndef UIP_ARCH_H_ #define UIP_ARCH_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" /** * Carry out a 32-bit addition. diff --git a/os/net/ip/uip-debug.c b/os/net/ipv6/uip-debug.c similarity index 98% rename from os/net/ip/uip-debug.c rename to os/net/ipv6/uip-debug.c index 01c0f9d6d..f83f0ee5b 100755 --- a/os/net/ip/uip-debug.c +++ b/os/net/ipv6/uip-debug.c @@ -37,8 +37,8 @@ * Joakim Eriksson */ -#include "net/ip/uip-debug.h" -#include "net/ip/ip64-addr.h" +#include "net/ipv6/uip-debug.h" +#include "net/ipv6/ip64-addr.h" /*---------------------------------------------------------------------------*/ void diff --git a/os/net/ip/uip-debug.h b/os/net/ipv6/uip-debug.h similarity index 98% rename from os/net/ip/uip-debug.h rename to os/net/ipv6/uip-debug.h index d8e238fe4..267a36aca 100644 --- a/os/net/ip/uip-debug.h +++ b/os/net/ipv6/uip-debug.h @@ -43,7 +43,7 @@ #define UIP_DEBUG_H #include "net/net-debug.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include void uip_debug_ipaddr_print(const uip_ipaddr_t *addr); diff --git a/os/net/ipv6/uip-ds6-nbr.h b/os/net/ipv6/uip-ds6-nbr.h index 6e199a11f..8f63c2634 100644 --- a/os/net/ipv6/uip-ds6-nbr.h +++ b/os/net/ipv6/uip-ds6-nbr.h @@ -46,12 +46,12 @@ #ifndef UIP_DS6_NEIGHBOR_H_ #define UIP_DS6_NEIGHBOR_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/nbr-table.h" #include "sys/stimer.h" #include "net/ipv6/uip-ds6.h" #if UIP_CONF_IPV6_QUEUE_PKT -#include "net/ip/uip-packetqueue.h" +#include "net/ipv6/uip-packetqueue.h" #endif /*UIP_CONF_QUEUE_PKT */ /*--------------------------------------------------*/ diff --git a/os/net/ipv6/uip-ds6-route.c b/os/net/ipv6/uip-ds6-route.c index ab727e36f..bf2522abf 100644 --- a/os/net/ipv6/uip-ds6-route.c +++ b/os/net/ipv6/uip-ds6-route.c @@ -40,7 +40,7 @@ */ #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-ds6-route.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "lib/list.h" #include "lib/memb.h" diff --git a/os/net/ipv6/uip-ds6-route.h b/os/net/ipv6/uip-ds6-route.h index 58fd2e80c..d554c4bcf 100644 --- a/os/net/ipv6/uip-ds6-route.h +++ b/os/net/ipv6/uip-ds6-route.h @@ -40,7 +40,7 @@ #ifndef UIP_DS6_ROUTE_H #define UIP_DS6_ROUTE_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/nbr-table.h" #include "sys/stimer.h" #include "lib/list.h" diff --git a/os/net/ipv6/uip-ds6.c b/os/net/ipv6/uip-ds6.c index 11a67e172..0ae1c496e 100644 --- a/os/net/ipv6/uip-ds6.c +++ b/os/net/ipv6/uip-ds6.c @@ -49,7 +49,7 @@ #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/multicast/uip-mcast6.h" -#include "net/ip/uip-packetqueue.h" +#include "net/ipv6/uip-packetqueue.h" /* Log configuration */ #include "sys/log.h" diff --git a/os/net/ipv6/uip-ds6.h b/os/net/ipv6/uip-ds6.h index 77c85841c..ccb8aa634 100644 --- a/os/net/ipv6/uip-ds6.h +++ b/os/net/ipv6/uip-ds6.h @@ -42,7 +42,7 @@ #ifndef UIP_DS6_H_ #define UIP_DS6_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "sys/stimer.h" /* The size of uip_ds6_addr_t depends on UIP_ND6_DEF_MAXDADNS. Include uip-nd6.h to define it. */ #include "net/ipv6/uip-nd6.h" @@ -176,7 +176,7 @@ /*--------------------------------------------------*/ #if UIP_CONF_IPV6_QUEUE_PKT -#include "net/ip/uip-packetqueue.h" +#include "net/ipv6/uip-packetqueue.h" #endif /*UIP_CONF_QUEUE_PKT */ /** \brief A prefix list entry */ diff --git a/os/net/ipv6/uip-icmp6.h b/os/net/ipv6/uip-icmp6.h index 2fd1c8fbf..e64b4feb4 100644 --- a/os/net/ipv6/uip-icmp6.h +++ b/os/net/ipv6/uip-icmp6.h @@ -45,7 +45,7 @@ #ifndef ICMP6_H_ #define ICMP6_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" /** \name ICMPv6 message types */ diff --git a/os/net/ip/uip-nameserver.c b/os/net/ipv6/uip-nameserver.c similarity index 100% rename from os/net/ip/uip-nameserver.c rename to os/net/ipv6/uip-nameserver.c diff --git a/os/net/ip/uip-nameserver.h b/os/net/ipv6/uip-nameserver.h similarity index 99% rename from os/net/ip/uip-nameserver.h rename to os/net/ipv6/uip-nameserver.h index 5565ca24e..12473b35b 100644 --- a/os/net/ip/uip-nameserver.h +++ b/os/net/ipv6/uip-nameserver.h @@ -44,7 +44,7 @@ #ifndef UIP_NAMESERVER_H_ #define UIP_NAMESERVER_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" /** * \name General diff --git a/os/net/ipv6/uip-nd6.c b/os/net/ipv6/uip-nd6.c index a432b934e..0c61b34c7 100644 --- a/os/net/ipv6/uip-nd6.c +++ b/os/net/ipv6/uip-nd6.c @@ -72,7 +72,7 @@ #include "net/ipv6/uip-icmp6.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip-nameserver.h" +#include "net/ipv6/uip-nameserver.h" #include "lib/random.h" /* Log configuration */ diff --git a/os/net/ipv6/uip-nd6.h b/os/net/ipv6/uip-nd6.h index 95e7f3045..01bfbc2fc 100644 --- a/os/net/ipv6/uip-nd6.h +++ b/os/net/ipv6/uip-nd6.h @@ -45,7 +45,7 @@ #ifndef UIP_ND6_H_ #define UIP_ND6_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "sys/stimer.h" /** * \name General diff --git a/os/net/ip/uip-packetqueue.c b/os/net/ipv6/uip-packetqueue.c similarity index 97% rename from os/net/ip/uip-packetqueue.c rename to os/net/ipv6/uip-packetqueue.c index 6cacb5f2b..847234c39 100644 --- a/os/net/ip/uip-packetqueue.c +++ b/os/net/ipv6/uip-packetqueue.c @@ -1,10 +1,10 @@ #include -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "lib/memb.h" -#include "net/ip/uip-packetqueue.h" +#include "net/ipv6/uip-packetqueue.h" #define MAX_NUM_QUEUED_PACKETS 2 MEMB(packets_memb, struct uip_packetqueue_packet, MAX_NUM_QUEUED_PACKETS); diff --git a/os/net/ip/uip-packetqueue.h b/os/net/ipv6/uip-packetqueue.h similarity index 100% rename from os/net/ip/uip-packetqueue.h rename to os/net/ipv6/uip-packetqueue.h diff --git a/os/net/ip/uip-udp-packet.c b/os/net/ipv6/uip-udp-packet.c similarity index 98% rename from os/net/ip/uip-udp-packet.c rename to os/net/ipv6/uip-udp-packet.c index d169c3909..91ddf598c 100644 --- a/os/net/ip/uip-udp-packet.c +++ b/os/net/ipv6/uip-udp-packet.c @@ -41,7 +41,7 @@ extern uint16_t uip_slen; -#include "net/ip/uip-udp-packet.h" +#include "net/ipv6/uip-udp-packet.h" #include "net/ipv6/multicast/uip-mcast6.h" #include diff --git a/os/net/ip/uip-udp-packet.h b/os/net/ipv6/uip-udp-packet.h similarity index 98% rename from os/net/ip/uip-udp-packet.h rename to os/net/ipv6/uip-udp-packet.h index 0f5b63bab..ff16f9e1c 100644 --- a/os/net/ip/uip-udp-packet.h +++ b/os/net/ipv6/uip-udp-packet.h @@ -40,7 +40,7 @@ #ifndef UIP_UDP_PACKET_H_ #define UIP_UDP_PACKET_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" void uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len); void uip_udp_packet_sendto(struct uip_udp_conn *c, const void *data, int len, diff --git a/os/net/ip/uip.h b/os/net/ipv6/uip.h similarity index 99% rename from os/net/ip/uip.h rename to os/net/ipv6/uip.h index e7354e380..58a9a1022 100755 --- a/os/net/ip/uip.h +++ b/os/net/ipv6/uip.h @@ -79,7 +79,7 @@ #endif /*NETSTACK_CONF_WITH_IPV6*/ -#include "net/ip/uipopt.h" +#include "net/ipv6/uipopt.h" /* For memcmp */ #include @@ -152,7 +152,7 @@ typedef uip_eth_addr uip_lladdr_t; #endif /*UIP_CONF_LL_80211*/ #endif /*UIP_CONF_LL_802154*/ -#include "net/ip/tcpip.h" +#include "net/ipv6/tcpip.h" /*---------------------------------------------------------------------------*/ /* First, the functions that should be called from the diff --git a/os/net/ipv6/uip6.c b/os/net/ipv6/uip6.c index a183cc898..e7604e290 100644 --- a/os/net/ipv6/uip6.c +++ b/os/net/ipv6/uip6.c @@ -72,9 +72,9 @@ */ #include "sys/cc.h" -#include "net/ip/uip.h" -#include "net/ip/uip-arch.h" -#include "net/ip/uipopt.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uip-arch.h" +#include "net/ipv6/uipopt.h" #include "net/ipv6/uip-icmp6.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-ds6.h" diff --git a/os/net/ip/uiplib.c b/os/net/ipv6/uiplib.c similarity index 97% rename from os/net/ip/uiplib.c rename to os/net/ipv6/uiplib.c index 35a56be4c..4cc9179eb 100644 --- a/os/net/ip/uiplib.c +++ b/os/net/ipv6/uiplib.c @@ -33,12 +33,12 @@ */ -#include "net/ip/uip.h" -#include "net/ip/uiplib.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uiplib.h" #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*-----------------------------------------------------------------------------------*/ #if NETSTACK_CONF_WITH_IPV6 diff --git a/os/net/ip/uiplib.h b/os/net/ipv6/uiplib.h similarity index 99% rename from os/net/ip/uiplib.h rename to os/net/ipv6/uiplib.h index 98adec02d..aa23435e0 100644 --- a/os/net/ip/uiplib.h +++ b/os/net/ipv6/uiplib.h @@ -43,7 +43,7 @@ #ifndef UIPLIB_H_ #define UIPLIB_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" /** * \addtogroup uipconvfunc diff --git a/os/net/ip/uipopt.h b/os/net/ipv6/uipopt.h similarity index 100% rename from os/net/ip/uipopt.h rename to os/net/ipv6/uipopt.h diff --git a/os/net/mac/llsec802154.h b/os/net/mac/llsec802154.h index 1b814c4c1..5f40e9988 100644 --- a/os/net/mac/llsec802154.h +++ b/os/net/mac/llsec802154.h @@ -54,7 +54,7 @@ #define LLSEC802154_H_ #include "net/mac/framer/frame802154.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #ifdef LLSEC802154_CONF_ENABLED #define LLSEC802154_ENABLED LLSEC802154_CONF_ENABLED diff --git a/os/net/mac/nullmac/nullmac.c b/os/net/mac/nullmac/nullmac.c index d0ef37bb0..a6199a3f9 100644 --- a/os/net/mac/nullmac/nullmac.c +++ b/os/net/mac/nullmac/nullmac.c @@ -39,8 +39,8 @@ #include "net/mac/nullmac/nullmac.h" #include "net/netstack.h" -#include "net/ip/uip.h" -#include "net/ip/tcpip.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/tcpip.h" #include "net/packetbuf.h" #include "net/netstack.h" diff --git a/os/net/net-debug.h b/os/net/net-debug.h index 27d2b4cc4..e724df195 100644 --- a/os/net/net-debug.h +++ b/os/net/net-debug.h @@ -42,7 +42,7 @@ #ifndef NET_DEBUG_H #define NET_DEBUG_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/linkaddr.h" #include diff --git a/os/net/rpl-classic/rpl-dag-root.c b/os/net/rpl-classic/rpl-dag-root.c index 2b38d21a7..96d00f6e1 100644 --- a/os/net/rpl-classic/rpl-dag-root.c +++ b/os/net/rpl-classic/rpl-dag-root.c @@ -40,7 +40,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define RPL_DAG_GRACE_PERIOD (CLOCK_SECOND * 20 * 1) diff --git a/os/net/rpl-classic/rpl-dag.c b/os/net/rpl-classic/rpl-dag.c index 13eb6d2a5..506b55ac7 100644 --- a/os/net/rpl-classic/rpl-dag.c +++ b/os/net/rpl-classic/rpl-dag.c @@ -46,7 +46,7 @@ #include "contiki.h" #include "net/link-stats.h" #include "net/rpl-classic/rpl-private.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-ds6-nbr.h" #include "net/nbr-table.h" @@ -59,7 +59,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* A configurable function called after every RPL parent switch */ #ifdef RPL_CALLBACK_PARENT_SWITCH diff --git a/os/net/rpl-classic/rpl-ext-header.c b/os/net/rpl-classic/rpl-ext-header.c index 00f6015a2..32b658df9 100644 --- a/os/net/rpl-classic/rpl-ext-header.c +++ b/os/net/rpl-classic/rpl-ext-header.c @@ -44,15 +44,15 @@ * @{ */ -#include "net/ip/uip.h" -#include "net/ip/tcpip.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/tcpip.h" #include "net/ipv6/uip-ds6.h" #include "net/rpl-classic/rpl-private.h" #include "net/rpl-classic/rpl-ns.h" #include "net/packetbuf.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include #include diff --git a/os/net/rpl-classic/rpl-icmp6.c b/os/net/rpl-classic/rpl-icmp6.c index e53c52391..c4f8041fe 100644 --- a/os/net/rpl-classic/rpl-icmp6.c +++ b/os/net/rpl-classic/rpl-icmp6.c @@ -45,8 +45,8 @@ * @{ */ -#include "net/ip/tcpip.h" -#include "net/ip/uip.h" +#include "net/ipv6/tcpip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-icmp6.h" @@ -61,7 +61,7 @@ #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*---------------------------------------------------------------------------*/ #define RPL_DIO_GROUNDED 0x80 diff --git a/os/net/rpl-classic/rpl-mrhof.c b/os/net/rpl-classic/rpl-mrhof.c index 162ac6b7f..635ffebd9 100644 --- a/os/net/rpl-classic/rpl-mrhof.c +++ b/os/net/rpl-classic/rpl-mrhof.c @@ -52,7 +52,7 @@ #include "net/link-stats.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* RFC6551 and RFC6719 do not mandate the use of a specific formula to * compute the ETX value. This MRHOF implementation relies on the value diff --git a/os/net/rpl-classic/rpl-nbr-policy.c b/os/net/rpl-classic/rpl-nbr-policy.c index fb544d7e3..d02dad52f 100644 --- a/os/net/rpl-classic/rpl-nbr-policy.c +++ b/os/net/rpl-classic/rpl-nbr-policy.c @@ -50,7 +50,7 @@ #include "net/ipv6/uip-ds6-route.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* * Policy for neighbor adds diff --git a/os/net/rpl-classic/rpl-ns.c b/os/net/rpl-classic/rpl-ns.c index efdf99d8c..523aab76c 100644 --- a/os/net/rpl-classic/rpl-ns.c +++ b/os/net/rpl-classic/rpl-ns.c @@ -39,8 +39,8 @@ #include "net/rpl-classic/rpl-conf.h" -#include "net/ip/uip.h" -#include "net/ip/tcpip.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/tcpip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-icmp6.h" #include "net/rpl-classic/rpl-private.h" @@ -51,7 +51,7 @@ #if RPL_WITH_NON_STORING #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include #include diff --git a/os/net/rpl-classic/rpl-of0.c b/os/net/rpl-classic/rpl-of0.c index 378d32a55..dd41fd58a 100644 --- a/os/net/rpl-classic/rpl-of0.c +++ b/os/net/rpl-classic/rpl-of0.c @@ -48,7 +48,7 @@ #include "net/link-stats.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* Constants from RFC6552. We use the default values. */ #define RANK_STRETCH 0 /* Must be in the range [0;5] */ diff --git a/os/net/rpl-classic/rpl-private.h b/os/net/rpl-classic/rpl-private.h index baef4483c..73de3104c 100644 --- a/os/net/rpl-classic/rpl-private.h +++ b/os/net/rpl-classic/rpl-private.h @@ -40,7 +40,7 @@ #include "net/rpl-classic/rpl.h" #include "lib/list.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "sys/clock.h" #include "sys/ctimer.h" #include "net/ipv6/uip-ds6.h" diff --git a/os/net/rpl-classic/rpl-timers.c b/os/net/rpl-classic/rpl-timers.c index 3ac39679f..bb1c769c8 100644 --- a/os/net/rpl-classic/rpl-timers.c +++ b/os/net/rpl-classic/rpl-timers.c @@ -50,7 +50,7 @@ #include "sys/ctimer.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* A configurable function called after update of the RPL DIO interval */ #ifdef RPL_CALLBACK_NEW_DIO_INTERVAL diff --git a/os/net/rpl-classic/rpl.c b/os/net/rpl-classic/rpl.c index c87bc0975..9f2a31e50 100644 --- a/os/net/rpl-classic/rpl.c +++ b/os/net/rpl-classic/rpl.c @@ -42,8 +42,8 @@ * @{ */ -#include "net/ip/uip.h" -#include "net/ip/tcpip.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/tcpip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-icmp6.h" #include "net/rpl-classic/rpl-private.h" @@ -51,7 +51,7 @@ #include "net/ipv6/multicast/uip-mcast6.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include #include diff --git a/os/net/rpl-classic/rpl.h b/os/net/rpl-classic/rpl.h index abf8ba757..185bcbef2 100644 --- a/os/net/rpl-classic/rpl.h +++ b/os/net/rpl-classic/rpl.h @@ -41,7 +41,7 @@ #include "net/rpl-classic/rpl-conf.h" #include "lib/list.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "sys/ctimer.h" diff --git a/os/net/rpl-lite/rpl-neighbor.h b/os/net/rpl-lite/rpl-neighbor.h index 08c03477a..fae51c072 100644 --- a/os/net/rpl-lite/rpl-neighbor.h +++ b/os/net/rpl-lite/rpl-neighbor.h @@ -43,7 +43,7 @@ #include "net/rpl-lite/rpl.h" #include "lib/list.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "sys/ctimer.h" diff --git a/os/net/rpl-lite/rpl-ns.h b/os/net/rpl-lite/rpl-ns.h index 8077cdf57..882db432e 100644 --- a/os/net/rpl-lite/rpl-ns.h +++ b/os/net/rpl-lite/rpl-ns.h @@ -43,7 +43,7 @@ /********** Includes **********/ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/rpl-lite/rpl.h" /** diff --git a/os/net/rpl-lite/rpl.h b/os/net/rpl-lite/rpl.h index d4804a356..10e3e941b 100644 --- a/os/net/rpl-lite/rpl.h +++ b/os/net/rpl-lite/rpl.h @@ -41,7 +41,7 @@ /********** Includes **********/ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/rpl-lite/rpl-const.h" #include "net/rpl-lite/rpl-conf.h" #include "net/rpl-lite/rpl-types.h" diff --git a/os/net/ip64/README.md b/os/services/ip64/README.md similarity index 100% rename from os/net/ip64/README.md rename to os/services/ip64/README.md diff --git a/os/net/ip64/ip64-addrmap.c b/os/services/ip64/ip64-addrmap.c similarity index 99% rename from os/net/ip64/ip64-addrmap.c rename to os/services/ip64/ip64-addrmap.c index 3a36b2344..d806c8ab1 100644 --- a/os/net/ip64/ip64-addrmap.c +++ b/os/services/ip64/ip64-addrmap.c @@ -29,7 +29,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#include "ip64-addrmap.h" +#include "ip64/ip64-addrmap.h" #include "lib/memb.h" #include "lib/list.h" diff --git a/os/net/ip64/ip64-addrmap.h b/os/services/ip64/ip64-addrmap.h similarity index 99% rename from os/net/ip64/ip64-addrmap.h rename to os/services/ip64/ip64-addrmap.h index 5f15bff47..8a2ae1eeb 100644 --- a/os/net/ip64/ip64-addrmap.h +++ b/os/services/ip64/ip64-addrmap.h @@ -34,7 +34,7 @@ #include "contiki.h" #include "sys/timer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" struct ip64_addrmap_entry { struct ip64_addrmap_entry *next; diff --git a/os/net/ip64/ip64-arp.c b/os/services/ip64/ip64-arp.c similarity index 99% rename from os/net/ip64/ip64-arp.c rename to os/services/ip64/ip64-arp.c index 996773e1d..5f3cff29a 100644 --- a/os/net/ip64/ip64-arp.c +++ b/os/services/ip64/ip64-arp.c @@ -32,9 +32,9 @@ * */ -#include "ip64.h" -#include "ip64-eth.h" -#include "ip64-arp.h" +#include "ip64/ip64.h" +#include "ip64/ip64-eth.h" +#include "ip64/ip64-arp.h" #include #include diff --git a/os/net/ip64/ip64-arp.h b/os/services/ip64/ip64-arp.h similarity index 98% rename from os/net/ip64/ip64-arp.h rename to os/services/ip64/ip64-arp.h index 1da84e519..f45faeb45 100644 --- a/os/net/ip64/ip64-arp.h +++ b/os/services/ip64/ip64-arp.h @@ -35,9 +35,9 @@ #ifndef IP64_ARP_H #define IP64_ARP_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" -#include "ip64-eth.h" +#include "ip64/ip64-eth.h" /* The uip_arp_init() function must be called before any of the other diff --git a/os/net/ip64/ip64-conf-example.h b/os/services/ip64/ip64-conf-example.h similarity index 96% rename from os/net/ip64/ip64-conf-example.h rename to os/services/ip64/ip64-conf-example.h index 5c08e7438..1168fae7a 100644 --- a/os/net/ip64/ip64-conf-example.h +++ b/os/services/ip64/ip64-conf-example.h @@ -32,8 +32,8 @@ #ifndef IP64_CONF_H #define IP64_CONF_H -#include "ip64-tap-driver.h" -#include "ip64-eth-interface.h" +#include "ip64/ip64-tap-driver.h" +#include "ip64/ip64-eth-interface.h" #define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_eth_interface #define IP64_CONF_INPUT ip64_eth_interface_input diff --git a/os/net/ip64/ip64-dhcpc.c b/os/services/ip64/ip64-dhcpc.c similarity index 99% rename from os/net/ip64/ip64-dhcpc.c rename to os/services/ip64/ip64-dhcpc.c index eda46bece..3e99cd512 100644 --- a/os/net/ip64/ip64-dhcpc.c +++ b/os/services/ip64/ip64-dhcpc.c @@ -36,9 +36,9 @@ #include "contiki.h" #include "contiki-net.h" -#include "ip64-dhcpc.h" +#include "ip64/ip64-dhcpc.h" -#include "ip64-addr.h" +#include "ipv6/ip64-addr.h" #define STATE_INITIAL 0 #define STATE_SENDING 1 diff --git a/os/net/ip64/ip64-dhcpc.h b/os/services/ip64/ip64-dhcpc.h similarity index 100% rename from os/net/ip64/ip64-dhcpc.h rename to os/services/ip64/ip64-dhcpc.h diff --git a/os/net/ip64/ip64-dns64.c b/os/services/ip64/ip64-dns64.c similarity index 99% rename from os/net/ip64/ip64-dns64.c rename to os/services/ip64/ip64-dns64.c index d9527629a..64d413dde 100644 --- a/os/net/ip64/ip64-dns64.c +++ b/os/services/ip64/ip64-dns64.c @@ -29,9 +29,9 @@ * */ -#include "ip64.h" -#include "ip64-addr.h" -#include "ip64-dns64.h" +#include "ip64/ip64.h" +#include "ipv6/ip64-addr.h" +#include "ip64/ip64-dns64.h" #include diff --git a/os/net/ip64/ip64-dns64.h b/os/services/ip64/ip64-dns64.h similarity index 100% rename from os/net/ip64/ip64-dns64.h rename to os/services/ip64/ip64-dns64.h diff --git a/os/net/ip64/ip64-driver.h b/os/services/ip64/ip64-driver.h similarity index 100% rename from os/net/ip64/ip64-driver.h rename to os/services/ip64/ip64-driver.h diff --git a/os/net/ip64/ip64-eth-interface.c b/os/services/ip64/ip64-eth-interface.c similarity index 96% rename from os/net/ip64/ip64-eth-interface.c rename to os/services/ip64/ip64-eth-interface.c index 437fbe24d..1dcaeb5ad 100644 --- a/os/net/ip64/ip64-eth-interface.c +++ b/os/services/ip64/ip64-eth-interface.c @@ -29,20 +29,20 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/slip.h" -#include "ip64.h" -#include "ip64-arp.h" -#include "ip64-eth-interface.h" +#include "ip64/ip64.h" +#include "ip64/ip64-arp.h" +#include "ip64/ip64-eth-interface.h" #include #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define printf(...) /*---------------------------------------------------------------------------*/ void diff --git a/os/net/ip64/ip64-eth-interface.h b/os/services/ip64/ip64-eth-interface.h similarity index 98% rename from os/net/ip64/ip64-eth-interface.h rename to os/services/ip64/ip64-eth-interface.h index 21bbd947f..1471b5d18 100644 --- a/os/net/ip64/ip64-eth-interface.h +++ b/os/services/ip64/ip64-eth-interface.h @@ -32,7 +32,7 @@ #ifndef IP64_ETH_INTERFACE_H #define IP64_ETH_INTERFACE_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" void ip64_eth_interface_input(uint8_t *packet, uint16_t len); diff --git a/os/net/ip64/ip64-eth.c b/os/services/ip64/ip64-eth.c similarity index 98% rename from os/net/ip64/ip64-eth.c rename to os/services/ip64/ip64-eth.c index 0a717c625..945d8886c 100644 --- a/os/net/ip64/ip64-eth.c +++ b/os/services/ip64/ip64-eth.c @@ -29,7 +29,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#include "ip64-eth.h" +#include "ip64/ip64-eth.h" #include diff --git a/os/net/ip64/ip64-eth.h b/os/services/ip64/ip64-eth.h similarity index 100% rename from os/net/ip64/ip64-eth.h rename to os/services/ip64/ip64-eth.h diff --git a/os/net/ip64/ip64-interface.h b/os/services/ip64/ip64-interface.h similarity index 100% rename from os/net/ip64/ip64-interface.h rename to os/services/ip64/ip64-interface.h diff --git a/os/net/ip64/ip64-ipv4-dhcp.c b/os/services/ip64/ip64-ipv4-dhcp.c similarity index 96% rename from os/net/ip64/ip64-ipv4-dhcp.c rename to os/services/ip64/ip64-ipv4-dhcp.c index a22c9f903..99d7c3e65 100644 --- a/os/net/ip64/ip64-ipv4-dhcp.c +++ b/os/services/ip64/ip64-ipv4-dhcp.c @@ -31,16 +31,16 @@ */ #include "contiki.h" #include "contiki-net.h" -#include "ip64-dhcpc.h" +#include "ip64/ip64-dhcpc.h" -#include "ip64.h" -#include "ip64-eth.h" -#include "ip64-addr.h" +#include "ip64/ip64.h" +#include "ip64/ip64-eth.h" +#include "ipv6/ip64-addr.h" #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" PROCESS(ip64_ipv4_dhcp_process, "IPv4 DHCP"); diff --git a/os/net/ip64/ip64-ipv4-dhcp.h b/os/services/ip64/ip64-ipv4-dhcp.h similarity index 100% rename from os/net/ip64/ip64-ipv4-dhcp.h rename to os/services/ip64/ip64-ipv4-dhcp.h diff --git a/os/net/ip64/ip64-null-driver.c b/os/services/ip64/ip64-null-driver.c similarity index 98% rename from os/net/ip64/ip64-null-driver.c rename to os/services/ip64/ip64-null-driver.c index dafef5ea5..97dd0505b 100644 --- a/os/net/ip64/ip64-null-driver.c +++ b/os/services/ip64/ip64-null-driver.c @@ -31,7 +31,7 @@ */ #include "contiki-net.h" -#include "ip64-driver.h" +#include "ip64/ip64-driver.h" /*---------------------------------------------------------------------------*/ static void init(void) diff --git a/os/net/ip64/ip64-null-driver.h b/os/services/ip64/ip64-null-driver.h similarity index 98% rename from os/net/ip64/ip64-null-driver.h rename to os/services/ip64/ip64-null-driver.h index f77691154..fc77273b8 100644 --- a/os/net/ip64/ip64-null-driver.h +++ b/os/services/ip64/ip64-null-driver.h @@ -32,7 +32,7 @@ #ifndef IP64_NULL_DRIVER_H #define IP64_NULL_DRIVER_H -#include "ip64-driver.h" +#include "ip64/ip64-driver.h" extern const struct ip64_driver ip64_null_driver; diff --git a/os/net/ip64/ip64-slip-interface.c b/os/services/ip64/ip64-slip-interface.c similarity index 98% rename from os/net/ip64/ip64-slip-interface.c rename to os/services/ip64/ip64-slip-interface.c index f62309cab..f6cd117e5 100644 --- a/os/net/ip64/ip64-slip-interface.c +++ b/os/services/ip64/ip64-slip-interface.c @@ -29,11 +29,11 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "dev/slip.h" -#include "ip64.h" +#include "ip64/ip64.h" #include #include @@ -41,7 +41,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static uip_ipaddr_t last_sender; diff --git a/os/net/ip64/ip64-slip-interface.h b/os/services/ip64/ip64-slip-interface.h similarity index 100% rename from os/net/ip64/ip64-slip-interface.h rename to os/services/ip64/ip64-slip-interface.h diff --git a/os/net/ip64/ip64-special-ports.c b/os/services/ip64/ip64-special-ports.c similarity index 97% rename from os/net/ip64/ip64-special-ports.c rename to os/services/ip64/ip64-special-ports.c index cea1571ea..bb88797ff 100644 --- a/os/net/ip64/ip64-special-ports.c +++ b/os/services/ip64/ip64-special-ports.c @@ -28,8 +28,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#include "ip64.h" -#include "ip64-special-ports.h" +#include "ip64/ip64.h" +#include "ip64/ip64-special-ports.h" #ifndef IP64_SPECIAL_PORTS_CONF_ENABLE #define EMPTY_DEFINITIONS 1 diff --git a/os/net/ip64/ip64-special-ports.h b/os/services/ip64/ip64-special-ports.h similarity index 100% rename from os/net/ip64/ip64-special-ports.h rename to os/services/ip64/ip64-special-ports.h diff --git a/os/net/ip64/ip64.c b/os/services/ip64/ip64.c similarity index 99% rename from os/net/ip64/ip64.c rename to os/services/ip64/ip64.c index ad5e08f27..f2bc06d25 100644 --- a/os/net/ip64/ip64.c +++ b/os/services/ip64/ip64.c @@ -52,19 +52,19 @@ ip64_set_ipv4_address() function. */ -#include "ip64.h" -#include "ip64-addr.h" -#include "ip64-addrmap.h" +#include "ip64/ip64.h" +#include "ipv6/ip64-addr.h" +#include "ip64/ip64-addrmap.h" #include "ip64-conf.h" -#include "ip64-special-ports.h" -#include "ip64-eth-interface.h" -#include "ip64-slip-interface.h" -#include "ip64-dns64.h" +#include "ip64/ip64-special-ports.h" +#include "ip64/ip64-eth-interface.h" +#include "ip64/ip64-slip-interface.h" +#include "ip64/ip64-dns64.h" #include "net/ipv6/uip-ds6.h" -#include "ip64-ipv4-dhcp.h" +#include "ip64/ip64-ipv4-dhcp.h" #include "contiki-net.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include /* for memcpy() */ #include /* for printf() */ diff --git a/os/net/ip64/ip64.h b/os/services/ip64/ip64.h similarity index 99% rename from os/net/ip64/ip64.h rename to os/services/ip64/ip64.h index 0837dc988..3f6efe1a4 100644 --- a/os/net/ip64/ip64.h +++ b/os/services/ip64/ip64.h @@ -32,7 +32,7 @@ #ifndef IP64_H #define IP64_H -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" void ip64_init(void); int ip64_6to4(const uint8_t *ipv6packet, const uint16_t ipv6len, diff --git a/os/services/lwm2m/lwm2m-engine.c b/os/services/lwm2m/lwm2m-engine.c index da925f102..1e313718f 100644 --- a/os/services/lwm2m/lwm2m-engine.c +++ b/os/services/lwm2m/lwm2m-engine.c @@ -63,7 +63,7 @@ #endif /* UIP_CONF_IPV6_RPL */ #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #ifndef LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX #ifdef LWM2M_DEVICE_MODEL_NUMBER diff --git a/os/services/orchestra/orchestra.c b/os/services/orchestra/orchestra.c index 169263555..3ea78ca96 100644 --- a/os/services/orchestra/orchestra.c +++ b/os/services/orchestra/orchestra.c @@ -46,7 +46,7 @@ #endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ #define DEBUG DEBUG_PRINT -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /* A net-layer sniffer for packets sent and received */ static void orchestra_packet_received(void); diff --git a/os/services/shell/shell-commands.c b/os/services/shell/shell-commands.c index c0667e504..4e6d91f0d 100644 --- a/os/services/shell/shell-commands.c +++ b/os/services/shell/shell-commands.c @@ -47,8 +47,8 @@ #include "shell-commands.h" #include "sys/log.h" #include "dev/watchdog.h" -#include "net/ip/uip.h" -#include "net/ip/uiplib.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/uiplib.h" #include "net/ipv6/uip-icmp6.h" #include "net/ipv6/uip-ds6.h" #include "net/mac/tsch/tsch.h" diff --git a/os/services/shell/shell.c b/os/services/shell/shell.c index d6ef20ccb..54356db5c 100644 --- a/os/services/shell/shell.c +++ b/os/services/shell/shell.c @@ -45,8 +45,8 @@ #include "contiki.h" #include "shell.h" #include "shell-commands.h" -#include "net/ip/uip.h" -#include "net/ip/ip64-addr.h" +#include "net/ipv6/uip.h" +#include "net/ipv6/ip64-addr.h" /*---------------------------------------------------------------------------*/ void diff --git a/os/services/shell/shell.h b/os/services/shell/shell.h index 938cb6998..d89672a13 100644 --- a/os/services/shell/shell.h +++ b/os/services/shell/shell.h @@ -43,7 +43,7 @@ #ifndef SHELL_H_ #define SHELL_H_ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/linkaddr.h" #include "sys/process.h" #include diff --git a/os/services/slip-cmd/packetutils.c b/os/services/slip-cmd/packetutils.c index 774b1e5c8..b7d8c75f3 100644 --- a/os/services/slip-cmd/packetutils.c +++ b/os/services/slip-cmd/packetutils.c @@ -30,7 +30,7 @@ #include "contiki.h" #include "net/packetbuf.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" /*---------------------------------------------------------------------------*/ int diff --git a/os/storage/antelope/aql-adt.c b/os/storage/antelope/aql-adt.c index fb9960e2e..d78f3f3c5 100644 --- a/os/storage/antelope/aql-adt.c +++ b/os/storage/antelope/aql-adt.c @@ -42,7 +42,7 @@ #include "aql.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static unsigned char char_buf[DB_MAX_CHAR_SIZE_PER_ROW]; static uint8_t next_free_offset; diff --git a/os/storage/antelope/aql-exec.c b/os/storage/antelope/aql-exec.c index 9d15dce4a..084b9aad0 100644 --- a/os/storage/antelope/aql-exec.c +++ b/os/storage/antelope/aql-exec.c @@ -42,7 +42,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "index.h" #include "relation.h" diff --git a/os/storage/antelope/index-inline.c b/os/storage/antelope/index-inline.c index 7141e4b8c..da97e50b4 100644 --- a/os/storage/antelope/index-inline.c +++ b/os/storage/antelope/index-inline.c @@ -48,7 +48,7 @@ #include "storage.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" struct search_handle { index_t *index; diff --git a/os/storage/antelope/index-maxheap.c b/os/storage/antelope/index-maxheap.c index 4d50f9729..7c479f936 100644 --- a/os/storage/antelope/index-maxheap.c +++ b/os/storage/antelope/index-maxheap.c @@ -64,7 +64,7 @@ #include "storage.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define BRANCH_FACTOR 2 #define BUCKET_SIZE 128 diff --git a/os/storage/antelope/index-memhash.c b/os/storage/antelope/index-memhash.c index d071610ab..56b338802 100644 --- a/os/storage/antelope/index-memhash.c +++ b/os/storage/antelope/index-memhash.c @@ -42,7 +42,7 @@ #include "index.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" static db_result_t create(index_t *); static db_result_t destroy(index_t *); diff --git a/os/storage/antelope/index.c b/os/storage/antelope/index.c index 53d979d99..5c96bf459 100644 --- a/os/storage/antelope/index.c +++ b/os/storage/antelope/index.c @@ -40,7 +40,7 @@ #include "lib/list.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "antelope.h" #include "attribute.h" diff --git a/os/storage/antelope/relation.c b/os/storage/antelope/relation.c index b8eac5070..c8757bf08 100644 --- a/os/storage/antelope/relation.c +++ b/os/storage/antelope/relation.c @@ -42,7 +42,7 @@ #include "lib/memb.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "db-options.h" #include "index.h" diff --git a/os/storage/antelope/result.c b/os/storage/antelope/result.c index 8b35dd745..68c998ea6 100644 --- a/os/storage/antelope/result.c +++ b/os/storage/antelope/result.c @@ -37,7 +37,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "result.h" #include "storage.h" diff --git a/os/storage/antelope/storage-cfs.c b/os/storage/antelope/storage-cfs.c index c3d10ac9f..f14cb95e5 100644 --- a/os/storage/antelope/storage-cfs.c +++ b/os/storage/antelope/storage-cfs.c @@ -43,7 +43,7 @@ #include "lib/random.h" #define DEBUG DEBUG_NONE -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "db-options.h" #include "storage.h" diff --git a/os/sys/log.c b/os/sys/log.c index 320ddeef0..98e982451 100644 --- a/os/sys/log.c +++ b/os/sys/log.c @@ -49,7 +49,7 @@ */ #include "sys/log.h" -#include "net/ip/ip64-addr.h" +#include "net/ipv6/ip64-addr.h" int curr_log_level_rpl = LOG_CONF_LEVEL_RPL; int curr_log_level_tcpip = LOG_CONF_LEVEL_TCPIP; diff --git a/os/sys/log.h b/os/sys/log.h index 87f631132..d22810b3f 100644 --- a/os/sys/log.h +++ b/os/sys/log.h @@ -55,7 +55,7 @@ #include "net/linkaddr.h" #include "sys/log-conf.h" #if NETSTACK_CONF_WITH_IPV6 -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #endif /* NETSTACK_CONF_WITH_IPV6 */ /* The different log levels available */ diff --git a/tests/08-ipv6/code-slip-radio/wait-dag.c b/tests/08-ipv6/code-slip-radio/wait-dag.c index cf00edb24..83e3d28f7 100644 --- a/tests/08-ipv6/code-slip-radio/wait-dag.c +++ b/tests/08-ipv6/code-slip-radio/wait-dag.c @@ -34,11 +34,11 @@ #include "contiki-lib.h" #include "contiki-net.h" #include "rpl.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include #define DEBUG DEBUG_FULL -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #define INTERVAL 5 * CLOCK_SECOND diff --git a/tests/14-rpl-lite/code/receiver-node.c b/tests/14-rpl-lite/code/receiver-node.c index 388b5b642..352f23cb5 100644 --- a/tests/14-rpl-lite/code/receiver-node.c +++ b/tests/14-rpl-lite/code/receiver-node.c @@ -31,10 +31,10 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-ds6-route.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "simple-udp.h" diff --git a/tests/14-rpl-lite/code/root-node.c b/tests/14-rpl-lite/code/root-node.c index 288de94cd..ef3c982ee 100644 --- a/tests/14-rpl-lite/code/root-node.c +++ b/tests/14-rpl-lite/code/root-node.c @@ -32,9 +32,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "simple-udp.h" diff --git a/tests/14-rpl-lite/code/sender-node.c b/tests/14-rpl-lite/code/sender-node.c index 55dfdd15f..350758110 100644 --- a/tests/14-rpl-lite/code/sender-node.c +++ b/tests/14-rpl-lite/code/sender-node.c @@ -32,9 +32,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "simple-udp.h" diff --git a/tests/15-rpl-classic/code/receiver-node.c b/tests/15-rpl-classic/code/receiver-node.c index 63c6f0cc3..770f50f77 100644 --- a/tests/15-rpl-classic/code/receiver-node.c +++ b/tests/15-rpl-classic/code/receiver-node.c @@ -31,10 +31,10 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-ds6-route.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "simple-udp.h" diff --git a/tests/15-rpl-classic/code/root-node.c b/tests/15-rpl-classic/code/root-node.c index 288de94cd..ef3c982ee 100644 --- a/tests/15-rpl-classic/code/root-node.c +++ b/tests/15-rpl-classic/code/root-node.c @@ -32,9 +32,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "simple-udp.h" diff --git a/tests/15-rpl-classic/code/sender-node.c b/tests/15-rpl-classic/code/sender-node.c index 55dfdd15f..350758110 100644 --- a/tests/15-rpl-classic/code/sender-node.c +++ b/tests/15-rpl-classic/code/sender-node.c @@ -32,9 +32,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" -#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-debug.h" #include "simple-udp.h" diff --git a/tools/sky/uip6-bridge/dev/slip.c b/tools/sky/uip6-bridge/dev/slip.c index a3988a9d4..e8062e515 100644 --- a/tools/sky/uip6-bridge/dev/slip.c +++ b/tools/sky/uip6-bridge/dev/slip.c @@ -37,7 +37,7 @@ #include "dev/ds2411/ds2411.h" #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #include "dev/slip.h" diff --git a/tools/sky/uip6-bridge/fakeuip.c b/tools/sky/uip6-bridge/fakeuip.c index 68f92978d..84f6440ce 100644 --- a/tools/sky/uip6-bridge/fakeuip.c +++ b/tools/sky/uip6-bridge/fakeuip.c @@ -4,7 +4,7 @@ * to get a few things */ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" #include diff --git a/tools/sky/uip6-bridge/uip6-bridge-tap.c b/tools/sky/uip6-bridge/uip6-bridge-tap.c index b16ac6715..20809e230 100644 --- a/tools/sky/uip6-bridge/uip6-bridge-tap.c +++ b/tools/sky/uip6-bridge/uip6-bridge-tap.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" #include "dev/slip.h" #include "dev/leds.h" #include "sicslow_ethernet.h" diff --git a/tools/wpcapslip/net/tcpdump.h b/tools/wpcapslip/net/tcpdump.h index bfa9fdd3e..faffa832b 100644 --- a/tools/wpcapslip/net/tcpdump.h +++ b/tools/wpcapslip/net/tcpdump.h @@ -32,7 +32,7 @@ #ifndef __TCPDUMP_H__ #define __TCPDUMP_H__ -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" int tcpdump_format(uint8_t *packet, uint16_t packetlen, char *printbuf, uint16_t printbuflen); diff --git a/tools/wpcapslip/wpcap.c b/tools/wpcapslip/wpcap.c index 6d6a1122f..54fc4e873 100644 --- a/tools/wpcapslip/wpcap.c +++ b/tools/wpcapslip/wpcap.c @@ -113,7 +113,7 @@ static int (* pcap_sendpacket)(struct pcap *, unsigned char *, int); #define ARP_HWTYPE_ETH 1 -#include "net/ip/uip.h" +#include "net/ipv6/uip.h" struct ethip_hdr { struct uip_eth_hdr ethhdr;