Updated include paths for the moved files under net/

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;

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 <ctype.h>
 
 #define DEBUG DEBUG_FULL
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #define MAX_SENSORS 4
 

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 <stdio.h>
 
 int border_router_cmd_handler(const uint8_t *data, int len);

examples/ipv6/native-border-router/tun-bridge.c

@@ -33,8 +33,8 @@
  *         Joakim Eriksson <joakime@sics.se>
  */
 
-#include "net/uip.h"
-#include "net/uip-ds6.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -52,7 +52,7 @@
 
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #ifdef linux
 #include <linux/if.h>

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

examples/ipv6/rpl-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 "dev/slip.h"
 #include "dev/uart1.h"
 #include <string.h>
@@ -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 *);
 

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;

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

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

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 <ctype.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])
 

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"
 

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"

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"
 

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

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

examples/ipv6/slip-radio/slip-radio.c

@@ -35,15 +35,15 @@
  *         Joakim Eriksson <joakime@sics.se>
  */
 #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 <string.h>
 #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"

examples/mbxxx/udp-ipv6-sleep/udp-client.c

@@ -37,7 +37,7 @@
 #include <string.h>
 
 #define DEBUG DEBUG_PRINT
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #define SEND_INTERVAL		25 * CLOCK_SECOND
 

examples/mbxxx/udp-ipv6-sleep/udp-server.c

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

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

examples/sensinode/sensors-ipv6/sensors-ipv6.c

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

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

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

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

examples/sensinode/udp-ipv6/server.c

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

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 <stdio.h> /* For printf() */

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 <stdio.h> /* For printf() */

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"
 

examples/trickle-library/trickle-library.c

@@ -42,7 +42,7 @@
 #include <string.h>
 
 #define DEBUG DEBUG_PRINT
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 /* Trickle variables and constants */
 static struct trickle_timer tt;

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 <string.h>
 #include <stdbool.h>
 
 #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

examples/udp-ipv6/udp-server.c

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

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