Updated include paths for the moved files under net/

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;

apps/antelope/aql-exec.c

@@ -42,7 +42,7 @@
 #include <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include "index.h"
 #include "relation.h"

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;

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

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 *);

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"

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"

apps/antelope/result.c

@@ -37,7 +37,7 @@
 #include <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include "result.h"
 #include "storage.h"

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"

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"

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"
 

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"
 

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"
 
 
 

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

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"
 

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;

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

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"
 

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"

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

core/net/ip/psock.c

@@ -34,7 +34,7 @@
 
 #include <string.h>
 
-#include "net/psock.h"
+#include "net/ip/psock.h"
 
 #define STATE_NONE 0
 #define STATE_ACKED 1

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 */

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 <string.h>
 

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;
 

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 <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #if UIP_LOGGING
 #include <stdio.h>

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);
 
 /**

core/net/ip/uip-debug.c

@@ -37,7 +37,7 @@
  *         Joakim Eriksson <joakime@sics.se>
  */
 
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 /*---------------------------------------------------------------------------*/
 void

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 <stdio.h>
 
 void uip_debug_ipaddr_print(const uip_ipaddr_t *addr);

core/net/ip/uip-packetqueue.c

@@ -1,10 +1,10 @@
 #include <stdio.h>
 
-#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);

core/net/ip/uip-split.c

@@ -34,12 +34,12 @@
 
 #include <string.h>
 
-#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])
 

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 <string.h>
 

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,

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

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.

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 <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 /*-----------------------------------------------------------------------------------*/
 #if UIP_CONF_IPV6

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

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
 

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

core/net/ipv4/uaodv.c

@@ -41,8 +41,8 @@
 #include <stdarg.h>
 
 #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"

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
 

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);
 

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
 
 /*

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.

core/net/ipv4/uip-neighbor.c

@@ -38,7 +38,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/uip-neighbor.h"
+#include "net/ipv4/uip-neighbor.h"
 
 #include <string.h>
 #include <stdio.h>

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

core/net/ipv4/uip-over-mesh.c

@@ -39,8 +39,8 @@
 
 #include <stdio.h>
 
-#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"

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);

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 <string.h>

core/net/ipv4/uip_arp.c

@@ -58,7 +58,7 @@
  */
 
 
-#include "net/uip_arp.h"
+#include "net/ipv4/uip_arp.h"
 
 #include <string.h>
 

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"
 
 
 

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 <stdio.h>
 
 #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;

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"
 
 /**

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)

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 */
 
 /*--------------------------------------------------*/

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);
 /*---------------------------------------------------------------------------*/

core/net/ipv6/uip-ds6.c

@@ -44,14 +44,14 @@
 #include <stdlib.h>
 #include <stddef.h>
 #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 */
 

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 */

core/net/ipv6/uip-icmp6.c

@@ -43,8 +43,8 @@
  */
 
 #include <string.h>
-#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

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 */

core/net/ipv6/uip-nd6.c

@@ -69,15 +69,15 @@
  */
 
 #include <string.h>
-#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 <stdio.h>

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

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 <string.h>
 
@@ -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"

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"
 

core/net/rime/rime-udp.c

@@ -39,8 +39,8 @@
 
 #include <string.h>
 
-#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"

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 <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/

core/net/rpl/rpl-ext-header.c

@@ -42,13 +42,13 @@
  *         Nicolas Tsiftes <nvt@sics.se>.
  */
 
-#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 <limits.h>
 #include <string.h>

core/net/rpl/rpl-icmp6.c

@@ -42,11 +42,11 @@
  *               Mathieu Pouillot <m.pouillot@watteco.com>
  */
 
-#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
 /*---------------------------------------------------------------------------*/

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);

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 *);

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

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;

core/net/rpl/rpl.c

@@ -40,13 +40,13 @@
  * \author Joakim Eriksson <joakime@sics.se>, Nicolas Tsiftes <nvt@sics.se>
  */
 
-#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 <limits.h>
 #include <string.h>

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"
 
 /*---------------------------------------------------------------------------*/

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;
 

cpu/6502/lib/log.c

@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "net/uip.h"
+#include "net/ip/uip.h"
 #include "sys/log.h"
 
 /*-----------------------------------------------------------------------------------*/

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"
 

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

cpu/arm/common/usb/cdc-eth/cdc-eth.c

@@ -3,7 +3,7 @@
 #include <uip_arp.h>
 #include <stdio.h>
 #include <string.h>
-#include <net/uip-fw.h>
+#include <net/ipv4/uip-fw.h>
 
 #define DATA_IN 0x81
 #define DATA_OUT 0x02

cpu/arm/common/usb/cdc-eth/cdc-eth.h

@@ -1,7 +1,7 @@
 #ifndef CDC_ETH_H_NUI0ULFC7C__
 #define CDC_ETH_H_NUI0ULFC7C__
 
-#include <net/uip.h>
+#include <net/ip/uip.h>
 
 /* Should be called before usb_cdc_eth_setup */
 void

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;
 

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"

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"

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"

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)
 /*---------------------------------------------------------------------------*/

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"

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
 

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
 

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"

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. */

cpu/stm32w108/uip-arch.c

@@ -42,8 +42,8 @@
 *			Salvatore Pitrulli <salvopitru@users.sourceforge.net>
 */
 
-#include "net/uip.h"
-#include "net/uip_arch.h"
+#include "net/ip/uip.h"
+#include "net/ip/uip_arch.h"
 
 #if UIP_TCP
 void

examples/cc2530dk/border-router/border-router.c

@@ -34,7 +34,7 @@
 #include <string.h>
 
 #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"

examples/cc2530dk/border-router/slip-bridge.c

@@ -38,8 +38,8 @@
  *         Nicolas Tsiftes <nvt@sics.se>
  */
 
-#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 <string.h>
@@ -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 *);
 

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");

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

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

examples/cc2530dk/udp-ipv6/server.c

@@ -34,7 +34,7 @@
 #include <string.h>
 
 #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"

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);

examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c

@@ -47,7 +47,7 @@
 #include <string.h>
 
 #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"

examples/ipv6/json-ws/json-ws-udp.c

@@ -48,7 +48,7 @@
 #include <string.h>
 
 #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;

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 <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 
 uint8_t command_context;