From 5f3fe7f7c7bf6b08b90bc7094d607cd75c6365fd Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Fri, 22 Nov 2013 09:17:54 +0100 Subject: [PATCH] Updated include paths for the moved files under net/ --- apps/antelope/aql-adt.c | 2 +- apps/antelope/aql-exec.c | 2 +- apps/antelope/index-inline.c | 2 +- apps/antelope/index-maxheap.c | 2 +- apps/antelope/index-memhash.c | 2 +- apps/antelope/index.c | 2 +- apps/antelope/relation.c | 2 +- apps/antelope/result.c | 2 +- apps/antelope/storage-cfs.c | 2 +- apps/codeprop/codeprop.c | 2 +- apps/codeprop/tcp_loader.c | 2 +- apps/codeprop/tcp_loader2.c | 2 +- apps/dhcp/dhcp.c | 2 +- apps/ftp/ftp.c | 2 +- apps/servreg-hack/servreg-hack.c | 4 ++-- apps/servreg-hack/servreg-hack.h | 2 +- apps/slip-cmd/packetutils.c | 2 +- core/contiki-net.h | 24 +++++++++---------- core/dev/slip.c | 4 ++-- core/net/ip/dhcpc.c | 2 +- core/net/ip/psock.c | 2 +- core/net/ip/resolv.c | 8 +++---- core/net/ip/simple-udp.c | 2 +- core/net/ip/simple-udp.h | 2 +- core/net/ip/tcpip.c | 10 ++++---- core/net/ip/tcpip.h | 2 +- core/net/ip/uip-debug.c | 2 +- core/net/ip/uip-debug.h | 2 +- core/net/ip/uip-packetqueue.c | 4 ++-- core/net/ip/uip-split.c | 10 ++++---- core/net/ip/uip-udp-packet.c | 2 +- core/net/ip/uip-udp-packet.h | 2 +- core/net/ip/uip.h | 4 ++-- core/net/ip/uip_arch.h | 2 +- core/net/ip/uiplib.c | 6 ++--- core/net/ip/uiplib.h | 2 +- core/net/ipv4/uaodv-def.h | 2 +- core/net/ipv4/uaodv-rt.c | 2 +- core/net/ipv4/uaodv.c | 4 ++-- core/net/ipv4/uip-fw-drv.c | 2 +- core/net/ipv4/uip-fw-drv.h | 2 +- core/net/ipv4/uip-fw.c | 8 +++---- core/net/ipv4/uip-fw.h | 2 +- core/net/ipv4/uip-neighbor.c | 2 +- core/net/ipv4/uip-neighbor.h | 2 +- core/net/ipv4/uip-over-mesh.c | 4 ++-- core/net/ipv4/uip-over-mesh.h | 4 ++-- core/net/ipv4/uip.c | 10 ++++---- core/net/ipv4/uip_arp.c | 2 +- core/net/ipv4/uip_arp.h | 2 +- core/net/ipv6/sicslowpan.c | 10 ++++---- core/net/ipv6/sicslowpan.h | 3 ++- core/net/ipv6/uip-ds6-nbr.c | 4 ++-- core/net/ipv6/uip-ds6-nbr.h | 6 ++--- core/net/ipv6/uip-ds6-route.c | 6 ++--- core/net/ipv6/uip-ds6.c | 8 +++---- core/net/ipv6/uip-ds6.h | 10 ++++---- core/net/ipv6/uip-icmp6.c | 4 ++-- core/net/ipv6/uip-icmp6.h | 2 +- core/net/ipv6/uip-nd6.c | 8 +++---- core/net/ipv6/uip-nd6.h | 2 +- core/net/ipv6/uip6.c | 12 +++++----- core/net/mac/nullmac.c | 3 +++ core/net/rime/rime-udp.c | 4 ++-- core/net/rpl/rpl-dag.c | 6 ++--- core/net/rpl/rpl-ext-header.c | 8 +++---- core/net/rpl/rpl-icmp6.c | 12 +++++----- core/net/rpl/rpl-mrhof.c | 2 +- core/net/rpl/rpl-of0.c | 2 +- core/net/rpl/rpl-private.h | 4 ++-- core/net/rpl/rpl-timers.c | 2 +- core/net/rpl/rpl.c | 8 +++---- core/net/rpl/rpl.h | 4 ++-- cpu/6502/ipconfig/ipconfig.c | 2 +- cpu/6502/lib/log.c | 2 +- cpu/6502/net/ethernet-drv.c | 2 +- cpu/6502/net/uip_arch.c | 4 ++-- cpu/arm/common/usb/cdc-eth/cdc-eth.c | 2 +- cpu/arm/common/usb/cdc-eth/cdc-eth.h | 2 +- cpu/mc1322x/config.c | 2 +- cpu/mc1322x/contiki-maca.c | 2 +- cpu/mc1322x/init.c | 2 +- cpu/msp430/loader-arch.c | 2 +- cpu/msp430/uip-ipchksum.c | 2 +- cpu/native/net/tapdev-drv.c | 4 ++-- cpu/native/net/tapdev.c | 4 ++-- cpu/native/net/tapdev6.c | 4 ++-- cpu/native/net/wpcap-drv.c | 2 +- cpu/stm32w108/clock.c | 2 +- cpu/stm32w108/uip-arch.c | 4 ++-- .../cc2530dk/border-router/border-router.c | 2 +- examples/cc2530dk/border-router/slip-bridge.c | 6 ++--- examples/cc2530dk/sniffer/sniffer.c | 2 +- examples/cc2530dk/udp-ipv6/client.c | 2 +- examples/cc2530dk/udp-ipv6/ping6.c | 2 +- examples/cc2530dk/udp-ipv6/server.c | 2 +- examples/cc2538dk/sniffer/sniffer.c | 2 +- .../udp-ipv6-echo-server/udp-echo-server.c | 2 +- examples/ipv6/json-ws/json-ws-udp.c | 2 +- .../native-border-router/border-router-cmds.c | 4 ++-- .../ipv6/native-border-router/border-router.c | 6 ++--- .../ipv6/native-border-router/border-router.h | 2 +- .../ipv6/native-border-router/tun-bridge.c | 6 ++--- .../ipv6/rpl-border-router/border-router.c | 6 ++--- examples/ipv6/rpl-border-router/slip-bridge.c | 6 ++--- examples/ipv6/rpl-collect/udp-sender.c | 8 +++---- examples/ipv6/rpl-collect/udp-sink.c | 4 ++-- examples/ipv6/rpl-udp/udp-client.c | 8 +++---- examples/ipv6/rpl-udp/udp-server.c | 4 ++-- .../ipv6/simple-udp-rpl/broadcast-example.c | 4 ++-- .../ipv6/simple-udp-rpl/unicast-receiver.c | 6 ++--- examples/ipv6/simple-udp-rpl/unicast-sender.c | 6 ++--- examples/ipv6/sky-websense/wget.c | 2 +- examples/ipv6/slip-radio/slip-net.c | 2 +- examples/ipv6/slip-radio/slip-radio.c | 6 ++--- examples/mbxxx/udp-ipv6-sleep/udp-client.c | 2 +- examples/mbxxx/udp-ipv6-sleep/udp-server.c | 2 +- .../sensinode/border-router/border-router.c | 2 +- .../sensinode/border-router/slip-bridge.c | 6 ++--- .../sensinode/sensors-ipv6/sensors-ipv6.c | 2 +- examples/sensinode/sniffer/sniffer.c | 2 +- examples/sensinode/udp-ipv6/client.c | 2 +- examples/sensinode/udp-ipv6/ping6.c | 2 +- examples/sensinode/udp-ipv6/server.c | 2 +- .../servreg-hack/example-servreg-client.c | 4 ++-- .../servreg-hack/example-servreg-server.c | 2 +- examples/sky/tcprudolph0.c | 2 +- examples/trickle-library/trickle-library.c | 2 +- examples/udp-ipv6/udp-client.c | 4 ++-- examples/udp-ipv6/udp-server.c | 2 +- examples/z1/ipv6/z1-websense/wget.c | 2 +- platform/avr-atmega128rfa1/contiki-main.c | 2 +- platform/avr-raven/contiki-raven-main.c | 2 +- platform/avr-ravenusb/sicslow_ethernet.c | 4 ++-- platform/avr-rcb/contiki-rcb-main.c | 2 +- platform/avr-zigbit/contiki-avr-zigbit-main.c | 2 +- platform/cc2530dk/uip-debug.c | 2 +- platform/cc2530dk/viztool.c | 4 ++-- platform/cc2538dk/contiki-main.c | 4 ++-- platform/cooja/contiki-cooja-main.c | 10 ++++---- platform/cooja/dev/ip.c | 2 +- platform/cooja/net/radio-uip-uaodv.c | 6 ++--- platform/cooja/net/uip-driver.c | 4 ++-- platform/cooja/testapps/testuaodv.c | 4 ++-- platform/cooja/testapps/testuip.c | 2 +- platform/econotag/main.c | 2 +- platform/econotag/platform_prints.c | 2 +- platform/exp5438/contiki-exp5438-main.c | 2 +- platform/exp5438/msp430.c | 2 +- platform/iris/init-net.c | 8 +++---- platform/mbxxx/contiki-main.c | 4 ++-- platform/micaz/init-net.c | 8 +++---- platform/minimal-net/contiki-main.c | 2 +- platform/native/contiki-main.c | 4 ++-- platform/sensinode/disco.c | 2 +- platform/sensinode/uip-debug.c | 2 +- platform/sensinode/viztool.c | 4 ++-- platform/sky/contiki-sky-main.c | 8 +++---- platform/wismote/contiki-wismote-main.c | 8 +++---- platform/z1/contiki-z1-main.c | 8 +++---- regression-tests/12-rpl/code/receiver-node.c | 6 ++--- regression-tests/12-rpl/code/root-node.c | 6 ++--- regression-tests/12-rpl/code/sender-node.c | 6 ++--- tools/sky/uip6-bridge/dev/slip.c | 4 ++-- tools/sky/uip6-bridge/fakeuip.c | 4 ++-- tools/sky/uip6-bridge/sicslow_ethernet.c | 6 ++--- tools/sky/uip6-bridge/uip6-bridge-tap.c | 2 +- tools/stm32w/uip6_bridge/dev/slip.c | 4 ++-- tools/stm32w/uip6_bridge/fakeuip.c | 4 ++-- tools/stm32w/uip6_bridge/sicslow_ethernet.c | 10 ++++---- tools/stm32w/uip6_bridge/uip6-bridge-tap.c | 2 +- tools/stm32w/wpcapslip6/fakeuip.c | 2 +- tools/stm32w/wpcapslip6/ip-process.c | 6 ++--- tools/stm32w/wpcapslip6/wpcap6.c | 4 ++-- tools/stm32w/wpcapslip6/wpcapslip6.c | 2 +- tools/wpcapslip/wpcap.c | 4 ++-- 176 files changed, 342 insertions(+), 338 deletions(-) diff --git a/apps/antelope/aql-adt.c b/apps/antelope/aql-adt.c index 3187f0a1c..fb9960e2e 100644 --- a/apps/antelope/aql-adt.c +++ b/apps/antelope/aql-adt.c @@ -42,7 +42,7 @@ #include "aql.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" static unsigned char char_buf[DB_MAX_CHAR_SIZE_PER_ROW]; static uint8_t next_free_offset; diff --git a/apps/antelope/aql-exec.c b/apps/antelope/aql-exec.c index b838a720f..9d15dce4a 100644 --- a/apps/antelope/aql-exec.c +++ b/apps/antelope/aql-exec.c @@ -42,7 +42,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "index.h" #include "relation.h" diff --git a/apps/antelope/index-inline.c b/apps/antelope/index-inline.c index 24527ee50..7141e4b8c 100644 --- a/apps/antelope/index-inline.c +++ b/apps/antelope/index-inline.c @@ -48,7 +48,7 @@ #include "storage.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" struct search_handle { index_t *index; diff --git a/apps/antelope/index-maxheap.c b/apps/antelope/index-maxheap.c index 0e8cfc30f..4d50f9729 100644 --- a/apps/antelope/index-maxheap.c +++ b/apps/antelope/index-maxheap.c @@ -64,7 +64,7 @@ #include "storage.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define BRANCH_FACTOR 2 #define BUCKET_SIZE 128 diff --git a/apps/antelope/index-memhash.c b/apps/antelope/index-memhash.c index db3c3fbe3..d071610ab 100644 --- a/apps/antelope/index-memhash.c +++ b/apps/antelope/index-memhash.c @@ -42,7 +42,7 @@ #include "index.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" static db_result_t create(index_t *); static db_result_t destroy(index_t *); diff --git a/apps/antelope/index.c b/apps/antelope/index.c index 0a7e53dc1..53d979d99 100644 --- a/apps/antelope/index.c +++ b/apps/antelope/index.c @@ -40,7 +40,7 @@ #include "lib/list.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "antelope.h" #include "attribute.h" diff --git a/apps/antelope/relation.c b/apps/antelope/relation.c index d28fddb19..b8eac5070 100644 --- a/apps/antelope/relation.c +++ b/apps/antelope/relation.c @@ -42,7 +42,7 @@ #include "lib/memb.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "db-options.h" #include "index.h" diff --git a/apps/antelope/result.c b/apps/antelope/result.c index e4e9fdf55..8b35dd745 100644 --- a/apps/antelope/result.c +++ b/apps/antelope/result.c @@ -37,7 +37,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "result.h" #include "storage.h" diff --git a/apps/antelope/storage-cfs.c b/apps/antelope/storage-cfs.c index 425873e2a..c3d10ac9f 100644 --- a/apps/antelope/storage-cfs.c +++ b/apps/antelope/storage-cfs.c @@ -43,7 +43,7 @@ #include "lib/random.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "db-options.h" #include "storage.h" diff --git a/apps/codeprop/codeprop.c b/apps/codeprop/codeprop.c index f7f4ca725..ead410ba7 100644 --- a/apps/codeprop/codeprop.c +++ b/apps/codeprop/codeprop.c @@ -71,7 +71,7 @@ #include "sys/clock.h" #include "loader/elfloader.h" -#include "net/tcpip.h" +#include "net/ip/tcpip.h" #include "dev/eeprom.h" #include "dev/leds.h" diff --git a/apps/codeprop/tcp_loader.c b/apps/codeprop/tcp_loader.c index 9c94384ce..d647915ed 100644 --- a/apps/codeprop/tcp_loader.c +++ b/apps/codeprop/tcp_loader.c @@ -37,7 +37,7 @@ #include "sys/etimer.h" #include "loader/elfloader_compat.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/xmem.h" diff --git a/apps/codeprop/tcp_loader2.c b/apps/codeprop/tcp_loader2.c index 58fda871e..eb1abf19f 100644 --- a/apps/codeprop/tcp_loader2.c +++ b/apps/codeprop/tcp_loader2.c @@ -39,7 +39,7 @@ #include "loader/cle.h" #include "loader/cmod.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/xmem.h" diff --git a/apps/dhcp/dhcp.c b/apps/dhcp/dhcp.c index a7d72943b..9ac20b102 100644 --- a/apps/dhcp/dhcp.c +++ b/apps/dhcp/dhcp.c @@ -1,6 +1,6 @@ #include "contiki-net.h" #include "ctk/ctk.h" -#include "net/dhcpc.h" +#include "net/ip/dhcpc.h" diff --git a/apps/ftp/ftp.c b/apps/ftp/ftp.c index b20499aee..a93a9c940 100644 --- a/apps/ftp/ftp.c +++ b/apps/ftp/ftp.c @@ -40,7 +40,7 @@ #include "contiki.h" #include "ctk/ctk.h" #include "cfs/cfs.h" -#include "net/resolv.h" +#include "net/ip/resolv.h" #define MAX_USERNAMELEN 16 #define MAX_PASSWORDLEN 16 diff --git a/apps/servreg-hack/servreg-hack.c b/apps/servreg-hack/servreg-hack.c index 3d3ca2409..3242433c6 100644 --- a/apps/servreg-hack/servreg-hack.c +++ b/apps/servreg-hack/servreg-hack.c @@ -44,9 +44,9 @@ #include "contiki-lib.h" #include "contiki-net.h" -#include "net/uip.h" +#include "net/ip/uip.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #include "servreg-hack.h" diff --git a/apps/servreg-hack/servreg-hack.h b/apps/servreg-hack/servreg-hack.h index e80cb50d6..11fc70eec 100644 --- a/apps/servreg-hack/servreg-hack.h +++ b/apps/servreg-hack/servreg-hack.h @@ -64,7 +64,7 @@ #define SERVREG_HACK_H #include "contiki-conf.h" -#include "net/uip.h" +#include "net/ip/uip.h" typedef uint8_t servreg_hack_id_t; typedef void servreg_hack_item_t; diff --git a/apps/slip-cmd/packetutils.c b/apps/slip-cmd/packetutils.c index 46ca3ad5f..774b1e5c8 100644 --- a/apps/slip-cmd/packetutils.c +++ b/apps/slip-cmd/packetutils.c @@ -30,7 +30,7 @@ #include "contiki.h" #include "net/packetbuf.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*---------------------------------------------------------------------------*/ int diff --git a/core/contiki-net.h b/core/contiki-net.h index 5e6cddd40..b733c265e 100644 --- a/core/contiki-net.h +++ b/core/contiki-net.h @@ -36,23 +36,23 @@ #include "contiki.h" -#include "net/tcpip.h" -#include "net/uip.h" -#include "net/uip-fw.h" -#include "net/uip-fw-drv.h" -#include "net/uip_arp.h" -#include "net/uiplib.h" -#include "net/uip-udp-packet.h" -#include "net/simple-udp.h" +#include "net/ip/tcpip.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" +#include "net/ipv4/uip-fw-drv.h" +#include "net/ipv4/uip_arp.h" +#include "net/ip/uiplib.h" +#include "net/ip/uip-udp-packet.h" +#include "net/ip/simple-udp.h" #if UIP_CONF_IPV6 -#include "net/uip-icmp6.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-icmp6.h" +#include "net/ipv6/uip-ds6.h" #endif /* UIP_CONF_IPV6 */ -#include "net/resolv.h" +#include "net/ip/resolv.h" -#include "net/psock.h" +#include "net/ip/psock.h" #include "net/rime.h" diff --git a/core/dev/slip.c b/core/dev/slip.c index 9535c05b7..22a658dc7 100644 --- a/core/dev/slip.c +++ b/core/dev/slip.c @@ -37,8 +37,8 @@ #include "contiki.h" -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #include "dev/slip.h" diff --git a/core/net/ip/dhcpc.c b/core/net/ip/dhcpc.c index 97a86fd96..46ba826da 100644 --- a/core/net/ip/dhcpc.c +++ b/core/net/ip/dhcpc.c @@ -35,7 +35,7 @@ #include "contiki.h" #include "contiki-net.h" -#include "net/dhcpc.h" +#include "net/ip/dhcpc.h" #define STATE_INITIAL 0 #define STATE_SENDING 1 diff --git a/core/net/ip/psock.c b/core/net/ip/psock.c index 47893a5de..5b662a827 100644 --- a/core/net/ip/psock.c +++ b/core/net/ip/psock.c @@ -34,7 +34,7 @@ #include -#include "net/psock.h" +#include "net/ip/psock.h" #define STATE_NONE 0 #define STATE_ACKED 1 diff --git a/core/net/ip/resolv.c b/core/net/ip/resolv.c index 7e310b0be..1116d9996 100644 --- a/core/net/ip/resolv.c +++ b/core/net/ip/resolv.c @@ -62,9 +62,9 @@ * */ -#include "net/tcpip.h" -#include "net/resolv.h" -#include "net/uip-udp-packet.h" +#include "net/ip/tcpip.h" +#include "net/ip/resolv.h" +#include "net/ip/uip-udp-packet.h" #include "lib/random.h" #ifndef DEBUG @@ -318,7 +318,7 @@ static const uip_ipaddr_t resolv_mdns_addr = #if UIP_CONF_IPV6 { { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb } }; -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #else /* UIP_CONF_IPV6 */ { { 224, 0, 0, 251 } }; #endif /* UIP_CONF_IPV6 */ diff --git a/core/net/ip/simple-udp.c b/core/net/ip/simple-udp.c index 61197f452..7c847bf5c 100644 --- a/core/net/ip/simple-udp.c +++ b/core/net/ip/simple-udp.c @@ -42,7 +42,7 @@ */ #include "contiki-net.h" -#include "net/simple-udp.h" +#include "net/ip/simple-udp.h" #include diff --git a/core/net/ip/simple-udp.h b/core/net/ip/simple-udp.h index 0198c2f10..e5a9439d7 100644 --- a/core/net/ip/simple-udp.h +++ b/core/net/ip/simple-udp.h @@ -53,7 +53,7 @@ #ifndef SIMPLE_UDP_H #define SIMPLE_UDP_H -#include "net/uip.h" +#include "net/ip/uip.h" struct simple_udp_connection; diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c index 5d9d8858a..7a889c84c 100644 --- a/core/net/ip/tcpip.c +++ b/core/net/ip/tcpip.c @@ -39,18 +39,18 @@ */ #include "contiki-net.h" -#include "net/uip-split.h" -#include "net/uip-packetqueue.h" +#include "net/ip/uip-split.h" +#include "net/ip/uip-packetqueue.h" #if UIP_CONF_IPV6 -#include "net/uip-nd6.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-nd6.h" +#include "net/ipv6/uip-ds6.h" #endif #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #if UIP_LOGGING #include diff --git a/core/net/ip/tcpip.h b/core/net/ip/tcpip.h index 1c968f1aa..dcc1ad19a 100644 --- a/core/net/ip/tcpip.h +++ b/core/net/ip/tcpip.h @@ -84,7 +84,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/uip.h" +#include "net/ip/uip.h" void tcpip_uipcall(void); /** diff --git a/core/net/ip/uip-debug.c b/core/net/ip/uip-debug.c index 9a4f0cb48..a9a6d5ed0 100644 --- a/core/net/ip/uip-debug.c +++ b/core/net/ip/uip-debug.c @@ -37,7 +37,7 @@ * Joakim Eriksson */ -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*---------------------------------------------------------------------------*/ void diff --git a/core/net/ip/uip-debug.h b/core/net/ip/uip-debug.h index 8a24f395d..6ffc1e638 100644 --- a/core/net/ip/uip-debug.h +++ b/core/net/ip/uip-debug.h @@ -41,7 +41,7 @@ #ifndef UIP_DEBUG_H #define UIP_DEBUG_H -#include "net/uip.h" +#include "net/ip/uip.h" #include void uip_debug_ipaddr_print(const uip_ipaddr_t *addr); diff --git a/core/net/ip/uip-packetqueue.c b/core/net/ip/uip-packetqueue.c index f9b9c2d80..6cacb5f2b 100644 --- a/core/net/ip/uip-packetqueue.c +++ b/core/net/ip/uip-packetqueue.c @@ -1,10 +1,10 @@ #include -#include "net/uip.h" +#include "net/ip/uip.h" #include "lib/memb.h" -#include "net/uip-packetqueue.h" +#include "net/ip/uip-packetqueue.h" #define MAX_NUM_QUEUED_PACKETS 2 MEMB(packets_memb, struct uip_packetqueue_packet, MAX_NUM_QUEUED_PACKETS); diff --git a/core/net/ip/uip-split.c b/core/net/ip/uip-split.c index 4d247e478..178d989b0 100644 --- a/core/net/ip/uip-split.c +++ b/core/net/ip/uip-split.c @@ -34,12 +34,12 @@ #include -#include "net/uip-split.h" -#include "net/uip.h" -#include "net/uip-fw.h" -#include "net/uip_arch.h" +#include "net/ip/uip-split.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" +#include "net/ip/uip_arch.h" -#include "net/tcpip.h" +#include "net/ip/tcpip.h" #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/core/net/ip/uip-udp-packet.c b/core/net/ip/uip-udp-packet.c index 96423bfcb..5b03be54b 100644 --- a/core/net/ip/uip-udp-packet.c +++ b/core/net/ip/uip-udp-packet.c @@ -41,7 +41,7 @@ extern uint16_t uip_slen; -#include "net/uip-udp-packet.h" +#include "net/ip/uip-udp-packet.h" #include diff --git a/core/net/ip/uip-udp-packet.h b/core/net/ip/uip-udp-packet.h index 294919f6e..0f5b63bab 100644 --- a/core/net/ip/uip-udp-packet.h +++ b/core/net/ip/uip-udp-packet.h @@ -40,7 +40,7 @@ #ifndef UIP_UDP_PACKET_H_ #define UIP_UDP_PACKET_H_ -#include "net/uip.h" +#include "net/ip/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/core/net/ip/uip.h b/core/net/ip/uip.h index 3e3d959bc..076734396 100644 --- a/core/net/ip/uip.h +++ b/core/net/ip/uip.h @@ -90,7 +90,7 @@ #endif /*UIP_CONF_IPV6*/ -#include "net/uipopt.h" +#include "net/ip/uipopt.h" /** * Representation of an IP address. @@ -153,7 +153,7 @@ typedef uip_eth_addr uip_lladdr_t; #endif /*UIP_CONF_LL_80211*/ #endif /*UIP_CONF_LL_802154*/ -#include "net/tcpip.h" +#include "net/ip/tcpip.h" /*---------------------------------------------------------------------------*/ /* First, the functions that should be called from the diff --git a/core/net/ip/uip_arch.h b/core/net/ip/uip_arch.h index bdef2b512..b4849bb5d 100644 --- a/core/net/ip/uip_arch.h +++ b/core/net/ip/uip_arch.h @@ -60,7 +60,7 @@ #ifndef UIP_ARCH_H_ #define UIP_ARCH_H_ -#include "net/uip.h" +#include "net/ip/uip.h" /** * Carry out a 32-bit addition. diff --git a/core/net/ip/uiplib.c b/core/net/ip/uiplib.c index e01f7d672..44b1b54e1 100644 --- a/core/net/ip/uiplib.c +++ b/core/net/ip/uiplib.c @@ -33,12 +33,12 @@ */ -#include "net/uip.h" -#include "net/uiplib.h" +#include "net/ip/uip.h" +#include "net/ip/uiplib.h" #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*-----------------------------------------------------------------------------------*/ #if UIP_CONF_IPV6 diff --git a/core/net/ip/uiplib.h b/core/net/ip/uiplib.h index 9c40bdc1c..5f053df5d 100644 --- a/core/net/ip/uiplib.h +++ b/core/net/ip/uiplib.h @@ -42,7 +42,7 @@ #ifndef UIPLIB_H_ #define UIPLIB_H_ -#include "net/uip.h" +#include "net/ip/uip.h" /** * \addtogroup uipconvfunc diff --git a/core/net/ipv4/uaodv-def.h b/core/net/ipv4/uaodv-def.h index 520e897da..5edb9f6ef 100644 --- a/core/net/ipv4/uaodv-def.h +++ b/core/net/ipv4/uaodv-def.h @@ -40,7 +40,7 @@ #ifndef UAODV_DEF_H_ #define UAODV_DEF_H_ -#include "net/uip.h" +#include "net/ip/uip.h" #define NUM_PRECURSORS 4 diff --git a/core/net/ipv4/uaodv-rt.c b/core/net/ipv4/uaodv-rt.c index 4fae93322..cad7db73f 100644 --- a/core/net/ipv4/uaodv-rt.c +++ b/core/net/ipv4/uaodv-rt.c @@ -38,7 +38,7 @@ */ -#include "net/uaodv-rt.h" +#include "net/ipv4/uaodv-rt.h" #include "contiki-net.h" #ifndef UAODV_NUM_RT_ENTRIES diff --git a/core/net/ipv4/uaodv.c b/core/net/ipv4/uaodv.c index 89de47f43..1365da2c9 100644 --- a/core/net/ipv4/uaodv.c +++ b/core/net/ipv4/uaodv.c @@ -41,8 +41,8 @@ #include #include "contiki.h" -#include "net/uaodv-def.h" -#include "net/uaodv-rt.h" +#include "net/ipv4/uaodv-def.h" +#include "net/ipv4/uaodv-rt.h" #define NDEBUG #include "lib/assert.h" diff --git a/core/net/ipv4/uip-fw-drv.c b/core/net/ipv4/uip-fw-drv.c index 7324fb7bb..d4f62b945 100644 --- a/core/net/ipv4/uip-fw-drv.c +++ b/core/net/ipv4/uip-fw-drv.c @@ -32,7 +32,7 @@ * */ -#include "net/uip-fw.h" +#include "net/ipv4/uip-fw.h" #if !UIP_CONF_IPV6 diff --git a/core/net/ipv4/uip-fw-drv.h b/core/net/ipv4/uip-fw-drv.h index 478022016..e88b8acf4 100644 --- a/core/net/ipv4/uip-fw-drv.h +++ b/core/net/ipv4/uip-fw-drv.h @@ -35,7 +35,7 @@ #define UIP_FW_DRV_H_ #include "contiki.h" -#include "net/uip-fw.h" +#include "net/ipv4/uip-fw.h" PROCESS_NAME(uip_fw_process); diff --git a/core/net/ipv4/uip-fw.c b/core/net/ipv4/uip-fw.c index 3c668890d..c152231c0 100644 --- a/core/net/ipv4/uip-fw.c +++ b/core/net/ipv4/uip-fw.c @@ -56,11 +56,11 @@ #include "contiki-conf.h" -#include "net/uip.h" -#include "net/uip_arch.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ip/uip_arch.h" +#include "net/ipv4/uip-fw.h" #ifdef AODV_COMPLIANCE -#include "net/uaodv-def.h" +#include "net/ipv4/uaodv-def.h" #endif /* diff --git a/core/net/ipv4/uip-fw.h b/core/net/ipv4/uip-fw.h index d662651b9..8f86241e6 100644 --- a/core/net/ipv4/uip-fw.h +++ b/core/net/ipv4/uip-fw.h @@ -45,7 +45,7 @@ #ifndef UIP_FW_H_ #define UIP_FW_H_ -#include "net/uip.h" +#include "net/ip/uip.h" /** * Representation of a uIP network interface. diff --git a/core/net/ipv4/uip-neighbor.c b/core/net/ipv4/uip-neighbor.c index 6d996a0f8..dbd21030c 100644 --- a/core/net/ipv4/uip-neighbor.c +++ b/core/net/ipv4/uip-neighbor.c @@ -38,7 +38,7 @@ * Adam Dunkels */ -#include "net/uip-neighbor.h" +#include "net/ipv4/uip-neighbor.h" #include #include diff --git a/core/net/ipv4/uip-neighbor.h b/core/net/ipv4/uip-neighbor.h index 5825f962d..fffbb2bf4 100644 --- a/core/net/ipv4/uip-neighbor.h +++ b/core/net/ipv4/uip-neighbor.h @@ -41,7 +41,7 @@ #ifndef UIP_NEIGHBOR_H_ #define UIP_NEIGHBOR_H_ -#include "net/uip.h" +#include "net/ip/uip.h" struct uip_neighbor_addr { #if UIP_NEIGHBOR_CONF_ADDRTYPE diff --git a/core/net/ipv4/uip-over-mesh.c b/core/net/ipv4/uip-over-mesh.c index f4a1a74f1..fd07aba8a 100644 --- a/core/net/ipv4/uip-over-mesh.c +++ b/core/net/ipv4/uip-over-mesh.c @@ -39,8 +39,8 @@ #include -#include "net/uip-fw.h" -#include "net/uip-over-mesh.h" +#include "net/ipv4/uip-fw.h" +#include "net/ipv4/uip-over-mesh.h" #include "net/rime/route-discovery.h" #include "net/rime/route.h" #include "net/rime/trickle.h" diff --git a/core/net/ipv4/uip-over-mesh.h b/core/net/ipv4/uip-over-mesh.h index 332b7784c..9a217c6c4 100644 --- a/core/net/ipv4/uip-over-mesh.h +++ b/core/net/ipv4/uip-over-mesh.h @@ -40,8 +40,8 @@ #ifndef UIP_OVER_MESH_H_ #define UIP_OVER_MESH_H_ -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #include "net/rime.h" void uip_over_mesh_init(uint16_t channels); diff --git a/core/net/ipv4/uip.c b/core/net/ipv4/uip.c index 03a2c4f59..7b381461e 100644 --- a/core/net/ipv4/uip.c +++ b/core/net/ipv4/uip.c @@ -70,10 +70,10 @@ * the packet back to the peer. */ -#include "net/uip.h" -#include "net/uipopt.h" -#include "net/uip_arp.h" -#include "net/uip_arch.h" +#include "net/ip/uip.h" +#include "net/ip/uipopt.h" +#include "net/ipv4/uip_arp.h" +#include "net/ip/uip_arch.h" #if !UIP_CONF_IPV6 /* If UIP_CONF_IPV6 is defined, we compile the uip6.c file instead of this one. Therefore @@ -82,7 +82,7 @@ #if UIP_CONF_IPV6 -#include "net/uip-neighbor.h" +#include "net/ipv4/uip-neighbor.h" #endif /* UIP_CONF_IPV6 */ #include diff --git a/core/net/ipv4/uip_arp.c b/core/net/ipv4/uip_arp.c index fdbc7bc20..09cfb49cf 100644 --- a/core/net/ipv4/uip_arp.c +++ b/core/net/ipv4/uip_arp.c @@ -58,7 +58,7 @@ */ -#include "net/uip_arp.h" +#include "net/ipv4/uip_arp.h" #include diff --git a/core/net/ipv4/uip_arp.h b/core/net/ipv4/uip_arp.h index 604a34370..16892bf14 100644 --- a/core/net/ipv4/uip_arp.h +++ b/core/net/ipv4/uip_arp.h @@ -51,7 +51,7 @@ #ifndef UIP_ARP_H_ #define UIP_ARP_H_ -#include "net/uip.h" +#include "net/ip/uip.h" diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c index 844064cae..5fb557013 100644 --- a/core/net/ipv6/sicslowpan.c +++ b/core/net/ipv6/sicslowpan.c @@ -60,11 +60,11 @@ #include "contiki.h" #include "dev/watchdog.h" -#include "net/tcpip.h" -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/tcpip.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "net/rime.h" -#include "net/sicslowpan.h" +#include "net/ipv6/sicslowpan.h" #include "net/netstack.h" #if UIP_CONF_IPV6 @@ -72,7 +72,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #if DEBUG /* PRINTFI and PRINTFO are defined for input and output to debug one without changing the timing of the other */ uint8_t p; diff --git a/core/net/ipv6/sicslowpan.h b/core/net/ipv6/sicslowpan.h index 9905fb707..84f1265c6 100644 --- a/core/net/ipv6/sicslowpan.h +++ b/core/net/ipv6/sicslowpan.h @@ -47,7 +47,8 @@ #ifndef SICSLOWPAN_H_ #define SICSLOWPAN_H_ -#include "net/uip.h" + +#include "net/ip/uip.h" #include "net/mac/mac.h" /** diff --git a/core/net/ipv6/uip-ds6-nbr.c b/core/net/ipv6/uip-ds6-nbr.c index 2f07154dc..1e2027fa9 100644 --- a/core/net/ipv6/uip-ds6-nbr.c +++ b/core/net/ipv6/uip-ds6-nbr.c @@ -49,10 +49,10 @@ #include "lib/list.h" #include "net/rime/rimeaddr.h" #include "net/packetbuf.h" -#include "net/uip-ds6-nbr.h" +#include "net/ipv6/uip-ds6-nbr.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #ifdef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED #define NEIGHBOR_STATE_CHANGED(n) UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED(n) diff --git a/core/net/ipv6/uip-ds6-nbr.h b/core/net/ipv6/uip-ds6-nbr.h index 4fe190533..150ba117a 100644 --- a/core/net/ipv6/uip-ds6-nbr.h +++ b/core/net/ipv6/uip-ds6-nbr.h @@ -46,14 +46,14 @@ #ifndef UIP_DS6_NEIGHBOR_H_ #define UIP_DS6_NEIGHBOR_H_ -#include "net/uip.h" +#include "net/ip/uip.h" #include "net/nbr-table.h" #include "sys/stimer.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #include "net/nbr-table.h" #if UIP_CONF_IPV6_QUEUE_PKT -#include "net/uip-packetqueue.h" +#include "net/ip/uip-packetqueue.h" #endif /*UIP_CONF_QUEUE_PKT */ /*--------------------------------------------------*/ diff --git a/core/net/ipv6/uip-ds6-route.c b/core/net/ipv6/uip-ds6-route.c index 5d692eb42..bcdfcbfd3 100644 --- a/core/net/ipv6/uip-ds6-route.c +++ b/core/net/ipv6/uip-ds6-route.c @@ -29,8 +29,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#include "net/uip-ds6.h" -#include "net/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip.h" #include "lib/list.h" #include "lib/memb.h" @@ -67,7 +67,7 @@ static int num_routes = 0; #undef DEBUG #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" static void rm_routelist_callback(nbr_table_item_t *ptr); /*---------------------------------------------------------------------------*/ diff --git a/core/net/ipv6/uip-ds6.c b/core/net/ipv6/uip-ds6.c index 6e4b86f71..3594f46e1 100644 --- a/core/net/ipv6/uip-ds6.c +++ b/core/net/ipv6/uip-ds6.c @@ -44,14 +44,14 @@ #include #include #include "lib/random.h" -#include "net/uip-nd6.h" -#include "net/uip-ds6.h" -#include "net/uip-packetqueue.h" +#include "net/ipv6/uip-nd6.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip-packetqueue.h" #if UIP_CONF_IPV6 #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" struct etimer uip_ds6_timer_periodic; /** \brief Timer for maintenance of data structures */ diff --git a/core/net/ipv6/uip-ds6.h b/core/net/ipv6/uip-ds6.h index 93dcd6868..45ec3c7a0 100644 --- a/core/net/ipv6/uip-ds6.h +++ b/core/net/ipv6/uip-ds6.h @@ -42,12 +42,12 @@ #ifndef UIP_DS6_H_ #define UIP_DS6_H_ -#include "net/uip.h" +#include "net/ip/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/uip-nd6.h" -#include "net/uip-ds6-route.h" -#include "net/uip-ds6-nbr.h" +#include "net/ipv6/uip-nd6.h" +#include "net/ipv6/uip-ds6-route.h" +#include "net/ipv6/uip-ds6-nbr.h" /*--------------------------------------------------*/ /** Configuration. For all tables (Neighbor cache, Prefix List, Routing Table, @@ -138,7 +138,7 @@ /*--------------------------------------------------*/ #if UIP_CONF_IPV6_QUEUE_PKT -#include "net/uip-packetqueue.h" +#include "net/ip/uip-packetqueue.h" #endif /*UIP_CONF_QUEUE_PKT */ /** \brief A prefix list entry */ diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c index d87067c6d..a527ed5ed 100644 --- a/core/net/ipv6/uip-icmp6.c +++ b/core/net/ipv6/uip-icmp6.c @@ -43,8 +43,8 @@ */ #include -#include "net/uip-ds6.h" -#include "net/uip-icmp6.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ipv6/uip-icmp6.h" #include "contiki-default-conf.h" #define DEBUG 0 diff --git a/core/net/ipv6/uip-icmp6.h b/core/net/ipv6/uip-icmp6.h index a33cdfd0e..9441cbc0e 100644 --- a/core/net/ipv6/uip-icmp6.h +++ b/core/net/ipv6/uip-icmp6.h @@ -46,7 +46,7 @@ #ifndef ICMP6_H_ #define ICMP6_H_ -#include "net/uip.h" +#include "net/ip/uip.h" /** \name ICMPv6 message types */ diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c index 4c9c1b775..2eb47f176 100644 --- a/core/net/ipv6/uip-nd6.c +++ b/core/net/ipv6/uip-nd6.c @@ -69,15 +69,15 @@ */ #include -#include "net/uip-icmp6.h" -#include "net/uip-nd6.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-icmp6.h" +#include "net/ipv6/uip-nd6.h" +#include "net/ipv6/uip-ds6.h" #include "lib/random.h" #if UIP_CONF_IPV6 /*------------------------------------------------------------------*/ #define DEBUG 0 -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #if UIP_LOGGING #include diff --git a/core/net/ipv6/uip-nd6.h b/core/net/ipv6/uip-nd6.h index de6412899..d6719ae33 100644 --- a/core/net/ipv6/uip-nd6.h +++ b/core/net/ipv6/uip-nd6.h @@ -45,7 +45,7 @@ #ifndef UIP_ND6_H_ #define UIP_ND6_H_ -#include "net/uip.h" +#include "net/ip/uip.h" #include "sys/stimer.h" /** * \name General diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c index d0b2095ee..fc3d244d2 100644 --- a/core/net/ipv6/uip6.c +++ b/core/net/ipv6/uip6.c @@ -70,11 +70,11 @@ * the packet back to the peer. */ -#include "net/uip.h" -#include "net/uipopt.h" -#include "net/uip-icmp6.h" -#include "net/uip-nd6.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ip/uipopt.h" +#include "net/ipv6/uip-icmp6.h" +#include "net/ipv6/uip-nd6.h" +#include "net/ipv6/uip-ds6.h" #include @@ -84,7 +84,7 @@ /*---------------------------------------------------------------------------*/ #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #if UIP_CONF_IPV6_RPL #include "rpl/rpl.h" diff --git a/core/net/mac/nullmac.c b/core/net/mac/nullmac.c index 785770c58..f65fedfdb 100644 --- a/core/net/mac/nullmac.c +++ b/core/net/mac/nullmac.c @@ -38,6 +38,9 @@ */ #include "net/mac/nullmac.h" +#include "net/netstack.h" +#include "net/ip/uip.h" +#include "net/ip/tcpip.h" #include "net/packetbuf.h" #include "net/netstack.h" diff --git a/core/net/rime/rime-udp.c b/core/net/rime/rime-udp.c index 18ac72913..0a6a50ca4 100644 --- a/core/net/rime/rime-udp.c +++ b/core/net/rime/rime-udp.c @@ -39,8 +39,8 @@ #include -#include "net/uip.h" -#include "net/uip-udp-packet.h" +#include "net/ip/uip.h" +#include "net/ip/uip-udp-packet.h" #include "net/uip-netif.h" #include "net/rime/rime-udp.h" #include "net/packetbuf.h" diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index 8f228e37b..6821b45de 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -43,8 +43,8 @@ #include "contiki.h" #include "net/rpl/rpl-private.h" -#include "net/uip.h" -#include "net/uip-nd6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-nd6.h" #include "net/nbr-table.h" #include "lib/list.h" #include "lib/memb.h" @@ -54,7 +54,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #if UIP_CONF_IPV6 /*---------------------------------------------------------------------------*/ diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c index 310c056cb..72289e0a4 100644 --- a/core/net/rpl/rpl-ext-header.c +++ b/core/net/rpl/rpl-ext-header.c @@ -42,13 +42,13 @@ * Nicolas Tsiftes . */ -#include "net/uip.h" -#include "net/tcpip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ip/tcpip.h" +#include "net/ipv6/uip-ds6.h" #include "net/rpl/rpl-private.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include #include diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c index f1d5a5e04..1ee1678b1 100644 --- a/core/net/rpl/rpl-icmp6.c +++ b/core/net/rpl/rpl-icmp6.c @@ -42,11 +42,11 @@ * Mathieu Pouillot */ -#include "net/tcpip.h" -#include "net/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-nd6.h" -#include "net/uip-icmp6.h" +#include "net/ip/tcpip.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ipv6/uip-nd6.h" +#include "net/ipv6/uip-icmp6.h" #include "net/rpl/rpl-private.h" #include "net/packetbuf.h" @@ -55,7 +55,7 @@ #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #if UIP_CONF_IPV6 /*---------------------------------------------------------------------------*/ diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c index 8154c5b62..9d75f319b 100644 --- a/core/net/rpl/rpl-mrhof.c +++ b/core/net/rpl/rpl-mrhof.c @@ -48,7 +48,7 @@ #include "net/nbr-table.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" static void reset(rpl_dag_t *); static void neighbor_link_callback(rpl_parent_t *, int, int); diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c index b67456bbc..94d1ebae6 100644 --- a/core/net/rpl/rpl-of0.c +++ b/core/net/rpl/rpl-of0.c @@ -42,7 +42,7 @@ #include "net/rpl/rpl-private.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" static void reset(rpl_dag_t *); static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *); diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h index 0aaee680e..acabda4b7 100644 --- a/core/net/rpl/rpl-private.h +++ b/core/net/rpl/rpl-private.h @@ -40,10 +40,10 @@ #include "net/rpl/rpl.h" #include "lib/list.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "sys/clock.h" #include "sys/ctimer.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" /*---------------------------------------------------------------------------*/ /** \brief Is IPv6 address addr the link-local, all-RPL-nodes diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c index acc1badf0..4465bd81b 100644 --- a/core/net/rpl/rpl-timers.c +++ b/core/net/rpl/rpl-timers.c @@ -47,7 +47,7 @@ #if UIP_CONF_IPV6 #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*---------------------------------------------------------------------------*/ static struct ctimer periodic_timer; diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c index 7e3111d65..48ee3c7ad 100644 --- a/core/net/rpl/rpl.c +++ b/core/net/rpl/rpl.c @@ -40,13 +40,13 @@ * \author Joakim Eriksson , Nicolas Tsiftes */ -#include "net/uip.h" -#include "net/tcpip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ip/tcpip.h" +#include "net/ipv6/uip-ds6.h" #include "net/rpl/rpl-private.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include #include diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h index 7d2a5ee70..562961d84 100644 --- a/core/net/rpl/rpl.h +++ b/core/net/rpl/rpl.h @@ -41,8 +41,8 @@ #include "rpl-conf.h" #include "lib/list.h" -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "sys/ctimer.h" /*---------------------------------------------------------------------------*/ diff --git a/cpu/6502/ipconfig/ipconfig.c b/cpu/6502/ipconfig/ipconfig.c index 6af051f50..d21994032 100644 --- a/cpu/6502/ipconfig/ipconfig.c +++ b/cpu/6502/ipconfig/ipconfig.c @@ -35,7 +35,7 @@ #include "contiki-net.h" #include "ctk/ctk.h" #include "cfs/cfs.h" -#include "net/dhcpc.h" +#include "net/ip/dhcpc.h" static struct ctk_window window; diff --git a/cpu/6502/lib/log.c b/cpu/6502/lib/log.c index ab95fc52a..93ed0eeda 100644 --- a/cpu/6502/lib/log.c +++ b/cpu/6502/lib/log.c @@ -35,7 +35,7 @@ #include #include -#include "net/uip.h" +#include "net/ip/uip.h" #include "sys/log.h" /*-----------------------------------------------------------------------------------*/ diff --git a/cpu/6502/net/ethernet-drv.c b/cpu/6502/net/ethernet-drv.c index 6c54022bb..e12122001 100644 --- a/cpu/6502/net/ethernet-drv.c +++ b/cpu/6502/net/ethernet-drv.c @@ -34,7 +34,7 @@ #include "contiki-net.h" #include "net/ethernet.h" -#include "net/uip-neighbor.h" +#include "net/ipv4/uip-neighbor.h" #include "net/ethernet-drv.h" diff --git a/cpu/6502/net/uip_arch.c b/cpu/6502/net/uip_arch.c index ae75db322..2176bd2c9 100644 --- a/cpu/6502/net/uip_arch.c +++ b/cpu/6502/net/uip_arch.c @@ -32,8 +32,8 @@ */ -#include "net/uip.h" -#include "net/uip_arch.h" +#include "net/ip/uip.h" +#include "net/ip/uip_arch.h" #define BUF ((uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define IP_PROTO_TCP 6 diff --git a/cpu/arm/common/usb/cdc-eth/cdc-eth.c b/cpu/arm/common/usb/cdc-eth/cdc-eth.c index e46b978d0..2d720ce20 100644 --- a/cpu/arm/common/usb/cdc-eth/cdc-eth.c +++ b/cpu/arm/common/usb/cdc-eth/cdc-eth.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #define DATA_IN 0x81 #define DATA_OUT 0x02 diff --git a/cpu/arm/common/usb/cdc-eth/cdc-eth.h b/cpu/arm/common/usb/cdc-eth/cdc-eth.h index 3e8cfb458..829d4654b 100644 --- a/cpu/arm/common/usb/cdc-eth/cdc-eth.h +++ b/cpu/arm/common/usb/cdc-eth/cdc-eth.h @@ -1,7 +1,7 @@ #ifndef CDC_ETH_H_NUI0ULFC7C__ #define CDC_ETH_H_NUI0ULFC7C__ -#include +#include /* Should be called before usb_cdc_eth_setup */ void diff --git a/cpu/mc1322x/config.c b/cpu/mc1322x/config.c index 2d7b10049..10fdb5f5d 100644 --- a/cpu/mc1322x/config.c +++ b/cpu/mc1322x/config.c @@ -5,7 +5,7 @@ /* debug */ #define DEBUG DEBUG_FULL -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" mc1322xConfig mc1322x_config; diff --git a/cpu/mc1322x/contiki-maca.c b/cpu/mc1322x/contiki-maca.c index 04de71608..87465228b 100644 --- a/cpu/mc1322x/contiki-maca.c +++ b/cpu/mc1322x/contiki-maca.c @@ -39,7 +39,7 @@ /* debug */ #define DEBUG DEBUG_ANNOTATE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /* contiki */ #include "radio.h" diff --git a/cpu/mc1322x/init.c b/cpu/mc1322x/init.c index c14b3f9ea..e3e58d467 100644 --- a/cpu/mc1322x/init.c +++ b/cpu/mc1322x/init.c @@ -2,7 +2,7 @@ /* debug */ #define DEBUG DEBUG_FULL -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /* contiki */ #include "sys/process.h" diff --git a/cpu/msp430/loader-arch.c b/cpu/msp430/loader-arch.c index d03d078f8..60413936a 100644 --- a/cpu/msp430/loader-arch.c +++ b/cpu/msp430/loader-arch.c @@ -33,7 +33,7 @@ #include "contiki.h" #include "sys/clock.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/leds.h" #include "dev/eeprom.h" diff --git a/cpu/msp430/uip-ipchksum.c b/cpu/msp430/uip-ipchksum.c index 80a616ffe..9f12a6749 100644 --- a/cpu/msp430/uip-ipchksum.c +++ b/cpu/msp430/uip-ipchksum.c @@ -35,7 +35,7 @@ * uIP checksum calculation for MSP430 */ -#include "net/uip.h" +#include "net/ip/uip.h" #define asmv(arg) __asm__ __volatile__(arg) /*---------------------------------------------------------------------------*/ diff --git a/cpu/native/net/tapdev-drv.c b/cpu/native/net/tapdev-drv.c index 8984dba01..0588030cb 100644 --- a/cpu/native/net/tapdev-drv.c +++ b/cpu/native/net/tapdev-drv.c @@ -31,8 +31,8 @@ */ #include "contiki-net.h" -#include "net/uip.h" -#include "net/uipopt.h" +#include "net/ip/uip.h" +#include "net/ip/uipopt.h" #if UIP_CONF_IPV6 #include "tapdev6.h" diff --git a/cpu/native/net/tapdev.c b/cpu/native/net/tapdev.c index 8ac8e514a..7ddf7ea10 100644 --- a/cpu/native/net/tapdev.c +++ b/cpu/native/net/tapdev.c @@ -33,8 +33,8 @@ * */ -#include "net/uip.h" -#include "net/uipopt.h" +#include "net/ip/uip.h" +#include "net/ip/uipopt.h" #if !UIP_CONF_IPV6 diff --git a/cpu/native/net/tapdev6.c b/cpu/native/net/tapdev6.c index 22815dd42..41fbd7ae6 100644 --- a/cpu/native/net/tapdev6.c +++ b/cpu/native/net/tapdev6.c @@ -33,8 +33,8 @@ * */ -#include "net/uip.h" -#include "net/uipopt.h" +#include "net/ip/uip.h" +#include "net/ip/uipopt.h" #if UIP_CONF_IPV6 diff --git a/cpu/native/net/wpcap-drv.c b/cpu/native/net/wpcap-drv.c index d9a1fd0e1..3362ec9c5 100644 --- a/cpu/native/net/wpcap-drv.c +++ b/cpu/native/net/wpcap-drv.c @@ -31,7 +31,7 @@ */ #include "contiki-net.h" -#include "net/uip-neighbor.h" +#include "net/ipv4/uip-neighbor.h" #include "net/wpcap.h" #include "net/wpcap-drv.h" diff --git a/cpu/stm32w108/clock.c b/cpu/stm32w108/clock.c index 65b8c4d64..f4a17ad53 100644 --- a/cpu/stm32w108/clock.c +++ b/cpu/stm32w108/clock.c @@ -56,7 +56,7 @@ #include "dev/stm32w-radio.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*--------------------------------------------------------------------------*/ /* The value that will be load in the SysTick value register. */ diff --git a/cpu/stm32w108/uip-arch.c b/cpu/stm32w108/uip-arch.c index 15a27206c..f913f0610 100644 --- a/cpu/stm32w108/uip-arch.c +++ b/cpu/stm32w108/uip-arch.c @@ -42,8 +42,8 @@ * Salvatore Pitrulli */ -#include "net/uip.h" -#include "net/uip_arch.h" +#include "net/ip/uip.h" +#include "net/ip/uip_arch.h" #if UIP_TCP void diff --git a/examples/cc2530dk/border-router/border-router.c b/examples/cc2530dk/border-router/border-router.c index c524a6f74..bc3bb1ba4 100644 --- a/examples/cc2530dk/border-router/border-router.c +++ b/examples/cc2530dk/border-router/border-router.c @@ -34,7 +34,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "net/rpl/rpl.h" #include "dev/watchdog.h" #include "dev/slip.h" diff --git a/examples/cc2530dk/border-router/slip-bridge.c b/examples/cc2530dk/border-router/slip-bridge.c index 0a37b85dd..98aee3bf9 100644 --- a/examples/cc2530dk/border-router/slip-bridge.c +++ b/examples/cc2530dk/border-router/slip-bridge.c @@ -38,8 +38,8 @@ * Nicolas Tsiftes */ -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "net/rpl/rpl.h" #include "dev/slip.h" #include @@ -47,7 +47,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" void set_prefix_64(uip_ipaddr_t *); diff --git a/examples/cc2530dk/sniffer/sniffer.c b/examples/cc2530dk/sniffer/sniffer.c index 2183f88d7..7ad375d88 100644 --- a/examples/cc2530dk/sniffer/sniffer.c +++ b/examples/cc2530dk/sniffer/sniffer.c @@ -31,7 +31,7 @@ #include "cc253x.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*---------------------------------------------------------------------------*/ PROCESS(sniffer_process, "Sniffer process"); diff --git a/examples/cc2530dk/udp-ipv6/client.c b/examples/cc2530dk/udp-ipv6/client.c index afbe758ef..77d50b0df 100644 --- a/examples/cc2530dk/udp-ipv6/client.c +++ b/examples/cc2530dk/udp-ipv6/client.c @@ -37,7 +37,7 @@ #include "debug.h" #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define SEND_INTERVAL 2 * CLOCK_SECOND #define MAX_PAYLOAD_LEN 40 diff --git a/examples/cc2530dk/udp-ipv6/ping6.c b/examples/cc2530dk/udp-ipv6/ping6.c index e6b9e6537..e19a36895 100644 --- a/examples/cc2530dk/udp-ipv6/ping6.c +++ b/examples/cc2530dk/udp-ipv6/ping6.c @@ -37,7 +37,7 @@ #include "debug.h" #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define PING6_NB 5 #define PING6_DATALEN 16 diff --git a/examples/cc2530dk/udp-ipv6/server.c b/examples/cc2530dk/udp-ipv6/server.c index f341472e9..0b61194aa 100644 --- a/examples/cc2530dk/udp-ipv6/server.c +++ b/examples/cc2530dk/udp-ipv6/server.c @@ -34,7 +34,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "dev/watchdog.h" #include "dev/leds.h" #include "net/rpl/rpl.h" diff --git a/examples/cc2538dk/sniffer/sniffer.c b/examples/cc2538dk/sniffer/sniffer.c index 9d257b8ad..3f042bf07 100644 --- a/examples/cc2538dk/sniffer/sniffer.c +++ b/examples/cc2538dk/sniffer/sniffer.c @@ -48,7 +48,7 @@ #include "contiki.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*---------------------------------------------------------------------------*/ PROCESS(sniffer_process, "Sniffer process"); AUTOSTART_PROCESSES(&sniffer_process); diff --git a/examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c b/examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c index 57b275458..655491b13 100644 --- a/examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c +++ b/examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c @@ -47,7 +47,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "dev/watchdog.h" #include "dev/leds.h" #include "net/rpl/rpl.h" diff --git a/examples/ipv6/json-ws/json-ws-udp.c b/examples/ipv6/json-ws/json-ws-udp.c index f43a6f29a..73112b8a6 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/uip-debug.h" +#include "net/ip/uip-debug.h" static struct uip_udp_conn *client_conn; static uip_ipaddr_t server_ipaddr; diff --git a/examples/ipv6/native-border-router/border-router-cmds.c b/examples/ipv6/native-border-router/border-router-cmds.c index eec4646ab..68f7af48c 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 "net/rpl/rpl.h" -#include "net/uiplib.h" +#include "net/ip/uiplib.h" #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/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 ba03a8356..b0c43e5c2 100644 --- a/examples/ipv6/native-border-router/border-router.c +++ b/examples/ipv6/native-border-router/border-router.c @@ -41,8 +41,8 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "net/rpl/rpl.h" #include "net/netstack.h" @@ -57,7 +57,7 @@ #include #define DEBUG DEBUG_FULL -#include "net/uip-debug.h" +#include "net/ip/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 4677085cc..68420320d 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/uip.h" +#include "net/ip/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 970b4cc79..22cb4289b 100644 --- a/examples/ipv6/native-border-router/tun-bridge.c +++ b/examples/ipv6/native-border-router/tun-bridge.c @@ -33,8 +33,8 @@ * Joakim Eriksson */ -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include #include #include @@ -52,7 +52,7 @@ #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/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 4128cac38..53f5c230e 100644 --- a/examples/ipv6/rpl-border-router/border-router.c +++ b/examples/ipv6/rpl-border-router/border-router.c @@ -38,8 +38,8 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "net/rpl/rpl.h" #include "net/netstack.h" @@ -52,7 +52,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" uint16_t dag_id[] = {0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011}; diff --git a/examples/ipv6/rpl-border-router/slip-bridge.c b/examples/ipv6/rpl-border-router/slip-bridge.c index ebf4f3c36..52b4a4060 100644 --- a/examples/ipv6/rpl-border-router/slip-bridge.c +++ b/examples/ipv6/rpl-border-router/slip-bridge.c @@ -38,8 +38,8 @@ * Nicolas Tsiftes */ -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "dev/slip.h" #include "dev/uart1.h" #include @@ -47,7 +47,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" void set_prefix_64(uip_ipaddr_t *); diff --git a/examples/ipv6/rpl-collect/udp-sender.c b/examples/ipv6/rpl-collect/udp-sender.c index cc8ed3bc1..fa13725fa 100644 --- a/examples/ipv6/rpl-collect/udp-sender.c +++ b/examples/ipv6/rpl-collect/udp-sender.c @@ -28,9 +28,9 @@ */ #include "contiki.h" -#include "net/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-udp-packet.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip-udp-packet.h" #include "net/rpl/rpl.h" #include "dev/serial-line.h" #if CONTIKI_TARGET_Z1 @@ -48,7 +48,7 @@ #define UDP_SERVER_PORT 5688 #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" static struct uip_udp_conn *client_conn; static uip_ipaddr_t server_ipaddr; diff --git a/examples/ipv6/rpl-collect/udp-sink.c b/examples/ipv6/rpl-collect/udp-sink.c index b2251b4ff..4f73c93f0 100644 --- a/examples/ipv6/rpl-collect/udp-sink.c +++ b/examples/ipv6/rpl-collect/udp-sink.c @@ -30,7 +30,7 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "net/rpl/rpl.h" #include "net/rime/rimeaddr.h" @@ -50,7 +50,7 @@ #include "collect-view.h" #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c index 5a993e3c7..c16b0ba48 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/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-udp-packet.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip-udp-packet.h" #include "sys/ctimer.h" #ifdef WITH_COMPOWER #include "powertrace.h" @@ -46,7 +46,7 @@ #define UDP_EXAMPLE_ID 190 #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/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 0e6c88b3b..b735d3bb2 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/uip.h" +#include "net/ip/uip.h" #include "net/rpl/rpl.h" #include "net/netstack.h" @@ -41,7 +41,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/examples/ipv6/simple-udp-rpl/broadcast-example.c b/examples/ipv6/simple-udp-rpl/broadcast-example.c index b394a8e3d..31f86e34a 100644 --- a/examples/ipv6/simple-udp-rpl/broadcast-example.c +++ b/examples/ipv6/simple-udp-rpl/broadcast-example.c @@ -34,8 +34,8 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "simple-udp.h" diff --git a/examples/ipv6/simple-udp-rpl/unicast-receiver.c b/examples/ipv6/simple-udp-rpl/unicast-receiver.c index 207c0fd27..1100886b4 100644 --- a/examples/ipv6/simple-udp-rpl/unicast-receiver.c +++ b/examples/ipv6/simple-udp-rpl/unicast-receiver.c @@ -34,9 +34,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-debug.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip-debug.h" #include "simple-udp.h" #include "servreg-hack.h" diff --git a/examples/ipv6/simple-udp-rpl/unicast-sender.c b/examples/ipv6/simple-udp-rpl/unicast-sender.c index 7726c6ea9..60cb91204 100644 --- a/examples/ipv6/simple-udp-rpl/unicast-sender.c +++ b/examples/ipv6/simple-udp-rpl/unicast-sender.c @@ -34,9 +34,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-debug.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip-debug.h" #include "sys/node-id.h" diff --git a/examples/ipv6/sky-websense/wget.c b/examples/ipv6/sky-websense/wget.c index 857c79a15..c7527b649 100644 --- a/examples/ipv6/sky-websense/wget.c +++ b/examples/ipv6/sky-websense/wget.c @@ -41,7 +41,7 @@ #include "dev/leds.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define DEBUG_LEDS 0 #undef LEDS_ON diff --git a/examples/ipv6/slip-radio/slip-net.c b/examples/ipv6/slip-radio/slip-net.c index 68b2aebc0..1482aefed 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/uip.h" +#include "net/ip/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 42ec17628..5223d57a6 100644 --- a/examples/ipv6/slip-radio/slip-radio.c +++ b/examples/ipv6/slip-radio/slip-radio.c @@ -35,15 +35,15 @@ * Joakim Eriksson */ #include "contiki.h" -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "dev/slip.h" #include #include "net/netstack.h" #include "net/packetbuf.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "cmd.h" #include "slip-radio.h" #include "packetutils.h" diff --git a/examples/mbxxx/udp-ipv6-sleep/udp-client.c b/examples/mbxxx/udp-ipv6-sleep/udp-client.c index 5b1511ad5..4408a2c19 100644 --- a/examples/mbxxx/udp-ipv6-sleep/udp-client.c +++ b/examples/mbxxx/udp-ipv6-sleep/udp-client.c @@ -37,7 +37,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define SEND_INTERVAL 25 * CLOCK_SECOND diff --git a/examples/mbxxx/udp-ipv6-sleep/udp-server.c b/examples/mbxxx/udp-ipv6-sleep/udp-server.c index 1dc9279a5..68fc1915c 100644 --- a/examples/mbxxx/udp-ipv6-sleep/udp-server.c +++ b/examples/mbxxx/udp-ipv6-sleep/udp-server.c @@ -34,7 +34,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/examples/sensinode/border-router/border-router.c b/examples/sensinode/border-router/border-router.c index 9cab28e42..028a2f770 100644 --- a/examples/sensinode/border-router/border-router.c +++ b/examples/sensinode/border-router/border-router.c @@ -34,7 +34,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "net/rpl/rpl.h" #include "dev/watchdog.h" #include "dev/slip.h" diff --git a/examples/sensinode/border-router/slip-bridge.c b/examples/sensinode/border-router/slip-bridge.c index ac7c67d14..fc9f95a28 100644 --- a/examples/sensinode/border-router/slip-bridge.c +++ b/examples/sensinode/border-router/slip-bridge.c @@ -38,8 +38,8 @@ * Nicolas Tsiftes */ -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include "net/rpl/rpl.h" #include "dev/slip.h" #include "dev/uart1.h" @@ -48,7 +48,7 @@ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" void set_prefix_64(uip_ipaddr_t *); diff --git a/examples/sensinode/sensors-ipv6/sensors-ipv6.c b/examples/sensinode/sensors-ipv6/sensors-ipv6.c index 839daf50e..1b563975b 100644 --- a/examples/sensinode/sensors-ipv6/sensors-ipv6.c +++ b/examples/sensinode/sensors-ipv6/sensors-ipv6.c @@ -51,7 +51,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "dev/watchdog.h" #include "dev/leds.h" #include "net/rpl/rpl.h" diff --git a/examples/sensinode/sniffer/sniffer.c b/examples/sensinode/sniffer/sniffer.c index ffde21209..74d24588e 100644 --- a/examples/sensinode/sniffer/sniffer.c +++ b/examples/sensinode/sniffer/sniffer.c @@ -31,7 +31,7 @@ #include "cc2430_sfr.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*---------------------------------------------------------------------------*/ PROCESS(sniffer_process, "Sniffer process"); diff --git a/examples/sensinode/udp-ipv6/client.c b/examples/sensinode/udp-ipv6/client.c index 8ad6520d5..8308d13a8 100644 --- a/examples/sensinode/udp-ipv6/client.c +++ b/examples/sensinode/udp-ipv6/client.c @@ -44,7 +44,7 @@ #endif #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define SEND_INTERVAL 2 * CLOCK_SECOND #define MAX_PAYLOAD_LEN 40 diff --git a/examples/sensinode/udp-ipv6/ping6.c b/examples/sensinode/udp-ipv6/ping6.c index ab5c4f81b..1acccd371 100644 --- a/examples/sensinode/udp-ipv6/ping6.c +++ b/examples/sensinode/udp-ipv6/ping6.c @@ -39,7 +39,7 @@ #endif #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define PING6_NB 5 #define PING6_DATALEN 16 diff --git a/examples/sensinode/udp-ipv6/server.c b/examples/sensinode/udp-ipv6/server.c index 5033d8ac1..fcdc0fec8 100644 --- a/examples/sensinode/udp-ipv6/server.c +++ b/examples/sensinode/udp-ipv6/server.c @@ -34,7 +34,7 @@ #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "dev/watchdog.h" #include "dev/leds.h" #include "net/rpl/rpl.h" diff --git a/examples/servreg-hack/example-servreg-client.c b/examples/servreg-hack/example-servreg-client.c index 0ea55d8ac..108d40aeb 100644 --- a/examples/servreg-hack/example-servreg-client.c +++ b/examples/servreg-hack/example-servreg-client.c @@ -39,8 +39,8 @@ #include "contiki.h" #include "contiki-lib.h" -#include "net/uip-debug.h" -#include "net/uip-ds6.h" +#include "net/ip/uip-debug.h" +#include "net/ipv6/uip-ds6.h" #include "servreg-hack.h" #include /* For printf() */ diff --git a/examples/servreg-hack/example-servreg-server.c b/examples/servreg-hack/example-servreg-server.c index 7af624f9a..01dd7175a 100644 --- a/examples/servreg-hack/example-servreg-server.c +++ b/examples/servreg-hack/example-servreg-server.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "contiki-lib.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #include "servreg-hack.h" #include /* For printf() */ diff --git a/examples/sky/tcprudolph0.c b/examples/sky/tcprudolph0.c index 3deaa0944..1dfea085f 100644 --- a/examples/sky/tcprudolph0.c +++ b/examples/sky/tcprudolph0.c @@ -37,7 +37,7 @@ #include "sys/etimer.h" #include "loader/elfloader.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/leds.h" diff --git a/examples/trickle-library/trickle-library.c b/examples/trickle-library/trickle-library.c index 4f81cb39f..6d716066e 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/uip-debug.h" +#include "net/ip/uip-debug.h" /* Trickle variables and constants */ static struct trickle_timer tt; diff --git a/examples/udp-ipv6/udp-client.c b/examples/udp-ipv6/udp-client.c index 656929b46..7f9b7659e 100644 --- a/examples/udp-ipv6/udp-client.c +++ b/examples/udp-ipv6/udp-client.c @@ -30,13 +30,13 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/resolv.h" +#include "net/ip/resolv.h" #include #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define SEND_INTERVAL 15 * CLOCK_SECOND #define MAX_PAYLOAD_LEN 40 diff --git a/examples/udp-ipv6/udp-server.c b/examples/udp-ipv6/udp-server.c index 8c88cf704..c56720f9a 100644 --- a/examples/udp-ipv6/udp-server.c +++ b/examples/udp-ipv6/udp-server.c @@ -34,7 +34,7 @@ #include #define DEBUG DEBUG_PRINT -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/examples/z1/ipv6/z1-websense/wget.c b/examples/z1/ipv6/z1-websense/wget.c index 75eb7cfd6..3d9b56974 100644 --- a/examples/z1/ipv6/z1-websense/wget.c +++ b/examples/z1/ipv6/z1-websense/wget.c @@ -41,7 +41,7 @@ #include "dev/leds.h" #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define DEBUG_LEDS 0 #undef LEDS_ON diff --git a/platform/avr-atmega128rfa1/contiki-main.c b/platform/avr-atmega128rfa1/contiki-main.c index 2bdf759ff..b749d0ac8 100644 --- a/platform/avr-atmega128rfa1/contiki-main.c +++ b/platform/avr-atmega128rfa1/contiki-main.c @@ -59,7 +59,7 @@ #include "radio/rf230bb/rf230bb.h" #include "net/mac/frame802154.h" #include "net/mac/framer-802154.h" -#include "net/sicslowpan.h" +#include "net/ipv6/sicslowpan.h" #include "contiki.h" #include "contiki-net.h" diff --git a/platform/avr-raven/contiki-raven-main.c b/platform/avr-raven/contiki-raven-main.c index 7f7a4603e..664efc299 100644 --- a/platform/avr-raven/contiki-raven-main.c +++ b/platform/avr-raven/contiki-raven-main.c @@ -69,7 +69,7 @@ unsigned char debugflowsize,debugflow[DEBUGFLOWSIZE]; #include "radio/rf230bb/rf230bb.h" #include "net/mac/frame802154.h" #include "net/mac/framer-802154.h" -#include "net/sicslowpan.h" +#include "net/ipv6/sicslowpan.h" #else //radio driver using Atmel/Cisco 802.15.4'ish MAC #include diff --git a/platform/avr-ravenusb/sicslow_ethernet.c b/platform/avr-ravenusb/sicslow_ethernet.c index 7159b7d4d..588100985 100644 --- a/platform/avr-ravenusb/sicslow_ethernet.c +++ b/platform/avr-ravenusb/sicslow_ethernet.c @@ -575,8 +575,8 @@ int8_t mac_translateIPLinkLayer(lltype_t target) } -#include "net/uip-icmp6.h" -#include "net/uip-nd6.h" +#include "net/ipv6/uip-icmp6.h" +#include "net/ipv6/uip-nd6.h" typedef struct { uint8_t type; diff --git a/platform/avr-rcb/contiki-rcb-main.c b/platform/avr-rcb/contiki-rcb-main.c index 24d3cd07e..4a6a98e22 100644 --- a/platform/avr-rcb/contiki-rcb-main.c +++ b/platform/avr-rcb/contiki-rcb-main.c @@ -44,7 +44,7 @@ #include "radio/rf230bb/rf230bb.h" #include "net/mac/frame802154.h" #include "net/mac/framer-802154.h" -#include "net/sicslowpan.h" +#include "net/ipv6/sicslowpan.h" #else //radio driver using Atmel/Cisco 802.15.4'ish MAC #include #include "mac.h" diff --git a/platform/avr-zigbit/contiki-avr-zigbit-main.c b/platform/avr-zigbit/contiki-avr-zigbit-main.c index 7eead3ff8..42aad02f9 100644 --- a/platform/avr-zigbit/contiki-avr-zigbit-main.c +++ b/platform/avr-zigbit/contiki-avr-zigbit-main.c @@ -55,7 +55,7 @@ #include "radio/rf230bb/rf230bb.h" #include "net/mac/frame802154.h" #include "net/mac/framer-802154.h" -#include "net/sicslowpan.h" +#include "net/ipv6/sicslowpan.h" #else //radio driver using Atmel/Cisco 802.15.4'ish MAC #include #include "mac.h" diff --git a/platform/cc2530dk/uip-debug.c b/platform/cc2530dk/uip-debug.c index d8e04f6d5..ee7942664 100644 --- a/platform/cc2530dk/uip-debug.c +++ b/platform/cc2530dk/uip-debug.c @@ -37,7 +37,7 @@ * Joakim Eriksson */ -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "debug.h" /*---------------------------------------------------------------------------*/ void diff --git a/platform/cc2530dk/viztool.c b/platform/cc2530dk/viztool.c index a88b08790..e6b2fbed3 100644 --- a/platform/cc2530dk/viztool.c +++ b/platform/cc2530dk/viztool.c @@ -41,12 +41,12 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/uip-ds6-route.h" +#include "net/ipv6/uip-ds6-route.h" #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) diff --git a/platform/cc2538dk/contiki-main.c b/platform/cc2538dk/contiki-main.c index 1b76d3bba..689e8a2f5 100644 --- a/platform/cc2538dk/contiki-main.c +++ b/platform/cc2538dk/contiki-main.c @@ -59,8 +59,8 @@ #include "lib/random.h" #include "net/netstack.h" #include "net/queuebuf.h" -#include "net/tcpip.h" -#include "net/uip.h" +#include "net/ip/tcpip.h" +#include "net/ip/uip.h" #include "net/mac/frame802154.h" #include "cpu.h" #include "reg.h" diff --git a/platform/cooja/contiki-cooja-main.c b/platform/cooja/contiki-cooja-main.c index 79a7b1992..2f91ef58e 100644 --- a/platform/cooja/contiki-cooja-main.c +++ b/platform/cooja/contiki-cooja-main.c @@ -80,10 +80,10 @@ #if WITH_UIP #include "dev/rs232.h" #include "dev/slip.h" -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #include "net/uip-fw-drv.h" -#include "net/uip-over-mesh.h" +#include "net/ipv4/uip-over-mesh.h" static struct uip_fw_netif slipif = {UIP_FW_NETIF(0,0,0,0, 255,255,255,255, slip_send)}; static struct uip_fw_netif meshif = @@ -97,8 +97,8 @@ static uint8_t is_gateway; #define WITH_UIP6 0 #endif #if WITH_UIP6 -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/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 /* WITH_UIP6 */ diff --git a/platform/cooja/dev/ip.c b/platform/cooja/dev/ip.c index b05af08a0..de513d074 100644 --- a/platform/cooja/dev/ip.c +++ b/platform/cooja/dev/ip.c @@ -31,7 +31,7 @@ #include "dev/ip.h" #include "lib/simEnvChange.h" -#include "net/uip.h" +#include "net/ip/uip.h" const struct simInterface ip_interface; diff --git a/platform/cooja/net/radio-uip-uaodv.c b/platform/cooja/net/radio-uip-uaodv.c index 9d29048c5..02c49994e 100644 --- a/platform/cooja/net/radio-uip-uaodv.c +++ b/platform/cooja/net/radio-uip-uaodv.c @@ -31,10 +31,10 @@ */ #include "radio-uip-uaodv.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "net/uaodv.h" -#include "net/uaodv-rt.h" -#include "net/uaodv-def.h" +#include "net/ipv4/uaodv-rt.h" +#include "net/ipv4/uaodv-def.h" #include "lib/crc16.h" #include "list.h" #include diff --git a/platform/cooja/net/uip-driver.c b/platform/cooja/net/uip-driver.c index 80ea47893..39dbd6e01 100644 --- a/platform/cooja/net/uip-driver.c +++ b/platform/cooja/net/uip-driver.c @@ -37,8 +37,8 @@ */ #include "net/netstack.h" -#include "net/uip.h" -#include "net/tcpip.h" +#include "net/ip/uip.h" +#include "net/ip/tcpip.h" #include "net/packetbuf.h" #include "net/uip-driver.h" #include diff --git a/platform/cooja/testapps/testuaodv.c b/platform/cooja/testapps/testuaodv.c index be7a0fa2d..771a94fce 100644 --- a/platform/cooja/testapps/testuaodv.c +++ b/platform/cooja/testapps/testuaodv.c @@ -29,12 +29,12 @@ */ #include -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/button-sensor.h" #include "dev/leds.h" #include "net/uaodv.h" -#include "net/uaodv-rt.h" +#include "net/ipv4/uaodv-rt.h" #include diff --git a/platform/cooja/testapps/testuip.c b/platform/cooja/testapps/testuip.c index aa92d65ed..727fdd26d 100644 --- a/platform/cooja/testapps/testuip.c +++ b/platform/cooja/testapps/testuip.c @@ -29,7 +29,7 @@ */ #include -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/button-sensor.h" #include "dev/leds.h" diff --git a/platform/econotag/main.c b/platform/econotag/main.c index cb31944fe..1646914fe 100644 --- a/platform/econotag/main.c +++ b/platform/econotag/main.c @@ -34,7 +34,7 @@ /* debug */ #define DEBUG DEBUG_FULL -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /* contiki */ #include "contiki.h" diff --git a/platform/econotag/platform_prints.c b/platform/econotag/platform_prints.c index d8b960770..c0a2cd4fc 100644 --- a/platform/econotag/platform_prints.c +++ b/platform/econotag/platform_prints.c @@ -3,7 +3,7 @@ #include "contiki.h" #include "net/netstack.h" -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" void print_processes(struct process * const processes[]) diff --git a/platform/exp5438/contiki-exp5438-main.c b/platform/exp5438/contiki-exp5438-main.c index de5dab975..ef532c1ab 100644 --- a/platform/exp5438/contiki-exp5438-main.c +++ b/platform/exp5438/contiki-exp5438-main.c @@ -54,7 +54,7 @@ #include "duty-cycle-scroller.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ diff --git a/platform/exp5438/msp430.c b/platform/exp5438/msp430.c index 838b41c12..0fe1ecd36 100644 --- a/platform/exp5438/msp430.c +++ b/platform/exp5438/msp430.c @@ -32,7 +32,7 @@ #include "contiki.h" #include "dev/watchdog.h" #include "dev/leds.h" -#include "net/uip.h" +#include "net/ip/uip.h" static unsigned long dco_speed; diff --git a/platform/iris/init-net.c b/platform/iris/init-net.c index 7f9d1fd34..7ec9cd5f1 100644 --- a/platform/iris/init-net.c +++ b/platform/iris/init-net.c @@ -54,14 +54,14 @@ #include "sys/node-id.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ #if WITH_UIP -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #include "net/uip-fw-drv.h" -#include "net/uip-over-mesh.h" +#include "net/ipv4/uip-over-mesh.h" static struct uip_fw_netif slipif = {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; static struct uip_fw_netif meshif = diff --git a/platform/mbxxx/contiki-main.c b/platform/mbxxx/contiki-main.c index 329c80f95..3e1369f31 100644 --- a/platform/mbxxx/contiki-main.c +++ b/platform/mbxxx/contiki-main.c @@ -71,10 +71,10 @@ #include "net/rime/rimeaddr.h" #include "net/rime.h" #include "net/rime/rime-udp.h" -#include "net/uip.h" +#include "net/ip/uip.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ #define DEBUG 1 diff --git a/platform/micaz/init-net.c b/platform/micaz/init-net.c index 6e67c43ae..ed1fadd7f 100644 --- a/platform/micaz/init-net.c +++ b/platform/micaz/init-net.c @@ -54,14 +54,14 @@ #include "sys/node-id.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ #if WITH_UIP -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #include "net/uip-fw-drv.h" -#include "net/uip-over-mesh.h" +#include "net/ipv4/uip-over-mesh.h" static struct uip_fw_netif slipif = {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; static struct uip_fw_netif meshif = diff --git a/platform/minimal-net/contiki-main.c b/platform/minimal-net/contiki-main.c index 511c43372..d8158605e 100644 --- a/platform/minimal-net/contiki-main.c +++ b/platform/minimal-net/contiki-main.c @@ -46,7 +46,7 @@ #include "dev/serial-line.h" -#include "net/uip.h" +#include "net/ip/uip.h" #ifdef __CYGWIN__ #include "net/wpcap-drv.h" #else /* __CYGWIN__ */ diff --git a/platform/native/contiki-main.c b/platform/native/contiki-main.c index 52c2680b3..5b92451c8 100644 --- a/platform/native/contiki-main.c +++ b/platform/native/contiki-main.c @@ -48,14 +48,14 @@ #include "dev/serial-line.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/button-sensor.h" #include "dev/pir-sensor.h" #include "dev/vib-sensor.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ #include "net/rime.h" diff --git a/platform/sensinode/disco.c b/platform/sensinode/disco.c index ccfbf3f09..63d95c6b9 100644 --- a/platform/sensinode/disco.c +++ b/platform/sensinode/disco.c @@ -63,7 +63,7 @@ #include "disco.h" /*---------------------------------------------------------------------------*/ #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" /*---------------------------------------------------------------------------*/ #if BATMON_CONF_ENABLED void batmon_log(uint8_t trigger); diff --git a/platform/sensinode/uip-debug.c b/platform/sensinode/uip-debug.c index d8e04f6d5..ee7942664 100644 --- a/platform/sensinode/uip-debug.c +++ b/platform/sensinode/uip-debug.c @@ -37,7 +37,7 @@ * Joakim Eriksson */ -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "debug.h" /*---------------------------------------------------------------------------*/ void diff --git a/platform/sensinode/viztool.c b/platform/sensinode/viztool.c index a88b08790..e6b2fbed3 100644 --- a/platform/sensinode/viztool.c +++ b/platform/sensinode/viztool.c @@ -41,12 +41,12 @@ #include "contiki.h" #include "contiki-lib.h" #include "contiki-net.h" -#include "net/uip-ds6-route.h" +#include "net/ipv6/uip-ds6-route.h" #include #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c index ff1551a94..a169f6d8c 100644 --- a/platform/sky/contiki-sky-main.c +++ b/platform/sky/contiki-sky-main.c @@ -44,7 +44,7 @@ #include "net/mac/frame802154.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ #include "net/rime.h" @@ -77,10 +77,10 @@ extern int msp430_dco_required; #endif #if WITH_UIP -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #include "net/uip-fw-drv.h" -#include "net/uip-over-mesh.h" +#include "net/ipv4/uip-over-mesh.h" static struct uip_fw_netif slipif = {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; static struct uip_fw_netif meshif = diff --git a/platform/wismote/contiki-wismote-main.c b/platform/wismote/contiki-wismote-main.c index 6e594db39..4775405d6 100644 --- a/platform/wismote/contiki-wismote-main.c +++ b/platform/wismote/contiki-wismote-main.c @@ -45,7 +45,7 @@ #include "net/mac/frame802154.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ #include "net/rime.h" @@ -71,10 +71,10 @@ extern const struct uip_router UIP_ROUTER_MODULE; #endif #if WITH_UIP -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #include "net/uip-fw-drv.h" -#include "net/uip-over-mesh.h" +#include "net/ipv4/uip-over-mesh.h" static struct uip_fw_netif slipif = {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; static struct uip_fw_netif meshif = diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index ecf970d77..c00a3b398 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -48,7 +48,7 @@ #include "sys/clock.h" #if WITH_UIP6 -#include "net/uip-ds6.h" +#include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ #include "net/rime.h" @@ -75,10 +75,10 @@ static struct timer mgt_timer; #endif #if WITH_UIP -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #include "net/uip-fw-drv.h" -#include "net/uip-over-mesh.h" +#include "net/ipv4/uip-over-mesh.h" static struct uip_fw_netif slipif = {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; static struct uip_fw_netif meshif = diff --git a/regression-tests/12-rpl/code/receiver-node.c b/regression-tests/12-rpl/code/receiver-node.c index fbbc14983..25e1e6758 100644 --- a/regression-tests/12-rpl/code/receiver-node.c +++ b/regression-tests/12-rpl/code/receiver-node.c @@ -31,9 +31,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-debug.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip-debug.h" #include "simple-udp.h" diff --git a/regression-tests/12-rpl/code/root-node.c b/regression-tests/12-rpl/code/root-node.c index e547e7479..0609e1bd8 100644 --- a/regression-tests/12-rpl/code/root-node.c +++ b/regression-tests/12-rpl/code/root-node.c @@ -32,9 +32,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-debug.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/uip-debug.h" #include "simple-udp.h" diff --git a/regression-tests/12-rpl/code/sender-node.c b/regression-tests/12-rpl/code/sender-node.c index 584c0dd85..08d81b62d 100644 --- a/regression-tests/12-rpl/code/sender-node.c +++ b/regression-tests/12-rpl/code/sender-node.c @@ -32,9 +32,9 @@ #include "lib/random.h" #include "sys/ctimer.h" #include "sys/etimer.h" -#include "net/uip.h" -#include "net/uip-ds6.h" -#include "net/uip-debug.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" +#include "net/ip/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 9b915ac5f..d96d09dbd 100644 --- a/tools/sky/uip6-bridge/dev/slip.c +++ b/tools/sky/uip6-bridge/dev/slip.c @@ -37,8 +37,8 @@ #include "dev/ds2411.h" #include "contiki.h" -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.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 af4c8ad3a..45f22ca11 100644 --- a/tools/sky/uip6-bridge/fakeuip.c +++ b/tools/sky/uip6-bridge/fakeuip.c @@ -4,8 +4,8 @@ * to get a few things */ -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/tools/sky/uip6-bridge/sicslow_ethernet.c b/tools/sky/uip6-bridge/sicslow_ethernet.c index 458468a2d..f008606e3 100644 --- a/tools/sky/uip6-bridge/sicslow_ethernet.c +++ b/tools/sky/uip6-bridge/sicslow_ethernet.c @@ -146,7 +146,7 @@ #include "uip.h" #include "uip_arp.h" /* For ethernet header structure */ #include "net/rime.h" -#include "net/sicslowpan.h" +#include "net/ipv6/sicslowpan.h" #include "sicslow_ethernet.h" #include @@ -372,8 +372,8 @@ int8_t mac_translateIPLinkLayer(lltype_t target) } -#include "net/uip-icmp6.h" -#include "net/uip-nd6.h" +#include "net/ipv6/uip-icmp6.h" +#include "net/ipv6/uip-nd6.h" typedef struct { uint8_t type; diff --git a/tools/sky/uip6-bridge/uip6-bridge-tap.c b/tools/sky/uip6-bridge/uip6-bridge-tap.c index 375c5e045..e0e413ffb 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/uip.h" +#include "net/ip/uip.h" #include "dev/slip.h" #include "dev/leds.h" #include "sicslow_ethernet.h" diff --git a/tools/stm32w/uip6_bridge/dev/slip.c b/tools/stm32w/uip6_bridge/dev/slip.c index 5dc043d96..a4ba4869d 100644 --- a/tools/stm32w/uip6_bridge/dev/slip.c +++ b/tools/stm32w/uip6_bridge/dev/slip.c @@ -39,8 +39,8 @@ #include "net/rime/rimeaddr.h" #include "sys/ctimer.h" -#include "net/uip.h" -#include "net/uip-fw.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip-fw.h" #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #include "dev/slip.h" diff --git a/tools/stm32w/uip6_bridge/fakeuip.c b/tools/stm32w/uip6_bridge/fakeuip.c index 9702cce57..e356a6469 100644 --- a/tools/stm32w/uip6_bridge/fakeuip.c +++ b/tools/stm32w/uip6_bridge/fakeuip.c @@ -4,8 +4,8 @@ * to get a few things */ -#include "net/uip.h" -#include "net/uip-ds6.h" +#include "net/ip/uip.h" +#include "net/ipv6/uip-ds6.h" #include #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) diff --git a/tools/stm32w/uip6_bridge/sicslow_ethernet.c b/tools/stm32w/uip6_bridge/sicslow_ethernet.c index e49081bd6..b6b9eafa7 100644 --- a/tools/stm32w/uip6_bridge/sicslow_ethernet.c +++ b/tools/stm32w/uip6_bridge/sicslow_ethernet.c @@ -148,10 +148,10 @@ * Modified! 0xff and 0xfe are sobstituted by 0x02 and 0x00. */ -#include "net/uip.h" -#include "net/uip_arp.h" /* For ethernet header structure */ +#include "net/ip/uip.h" +#include "net/ipv4/uip_arp.h" /* For ethernet header structure */ #include "net/rime.h" -#include "net/sicslowpan.h" +#include "net/ipv6/sicslowpan.h" #include "sicslow_ethernet.h" #include "dev/stm32w-radio.h" #include "net/mac/frame802154.h" @@ -399,8 +399,8 @@ int8_t mac_translateIPLinkLayer(lltype_t target) } -#include "net/uip-icmp6.h" -#include "net/uip-nd6.h" +#include "net/ipv6/uip-icmp6.h" +#include "net/ipv6/uip-nd6.h" typedef struct { uint8_t type; diff --git a/tools/stm32w/uip6_bridge/uip6-bridge-tap.c b/tools/stm32w/uip6_bridge/uip6-bridge-tap.c index e5d2cb695..6fea42db2 100644 --- a/tools/stm32w/uip6_bridge/uip6-bridge-tap.c +++ b/tools/stm32w/uip6_bridge/uip6-bridge-tap.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/uip.h" +#include "net/ip/uip.h" #include "dev/slip.h" #include "dev/leds.h" #include "sicslow_ethernet.h" diff --git a/tools/stm32w/wpcapslip6/fakeuip.c b/tools/stm32w/wpcapslip6/fakeuip.c index 401b60770..73d103cdf 100644 --- a/tools/stm32w/wpcapslip6/fakeuip.c +++ b/tools/stm32w/wpcapslip6/fakeuip.c @@ -5,7 +5,7 @@ #define UIP_CONF_IPV6 1 -#include "net/uip.h" +#include "net/ip/uip.h" #include #include diff --git a/tools/stm32w/wpcapslip6/ip-process.c b/tools/stm32w/wpcapslip6/ip-process.c index 50b2cd84a..ccd73d0e7 100644 --- a/tools/stm32w/wpcapslip6/ip-process.c +++ b/tools/stm32w/wpcapslip6/ip-process.c @@ -6,7 +6,7 @@ #define DEBUG DEBUG_NONE -#include "net/uip-debug.h" +#include "net/ip/uip-debug.h" #include "ip-process.h" @@ -46,8 +46,8 @@ int8_t mac_translateIPLinkLayer() return 0; } -#include "net/uip-icmp6.h" -#include "net/uip-nd6.h" +#include "net/ipv6/uip-icmp6.h" +#include "net/ipv6/uip-nd6.h" typedef struct { uint8_t type; diff --git a/tools/stm32w/wpcapslip6/wpcap6.c b/tools/stm32w/wpcapslip6/wpcap6.c index 163a9cfbe..29310801a 100644 --- a/tools/stm32w/wpcapslip6/wpcap6.c +++ b/tools/stm32w/wpcapslip6/wpcap6.c @@ -119,8 +119,8 @@ static int (* pcap_sendpacket)(struct pcap *, unsigned char *, int); #define BUFSIZE 1514 -#include "net/uip.h" -#include "net/uip_arp.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip_arp.h" struct uip_eth_addr uip_lladdr = {{0,0,0,0,0,0}}; diff --git a/tools/stm32w/wpcapslip6/wpcapslip6.c b/tools/stm32w/wpcapslip6/wpcapslip6.c index 6b4c0cb5c..08d0c4843 100755 --- a/tools/stm32w/wpcapslip6/wpcapslip6.c +++ b/tools/stm32w/wpcapslip6/wpcapslip6.c @@ -69,7 +69,7 @@ #include -#include "net/uip_arp.h" +#include "net/ipv4/uip_arp.h" #include "ip-process.h" diff --git a/tools/wpcapslip/wpcap.c b/tools/wpcapslip/wpcap.c index ba641e4d7..5584557a9 100644 --- a/tools/wpcapslip/wpcap.c +++ b/tools/wpcapslip/wpcap.c @@ -114,8 +114,8 @@ static int (* pcap_sendpacket)(struct pcap *, unsigned char *, int); #define ARP_HWTYPE_ETH 1 -#include "net/uip.h" -#include "net/uip_arp.h" +#include "net/ip/uip.h" +#include "net/ipv4/uip_arp.h" struct ethip_hdr { struct uip_eth_hdr ethhdr;