Updated include paths for the moved files under net/

hosssha · Jan 26, 2014 · 5f3fe7f · 5f3fe7f
1 parent afdeed1
commit 5f3fe7f
Show file tree

Hide file tree

Showing 176 changed files with 342 additions and 338 deletions.
diff --git 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
@@ -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"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -34,7 +34,7 @@
 
 #include <string.h>
 
-#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
@@ -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
@@ -42,7 +42,7 @@
  */
 
 #include "contiki-net.h"
-#include "net/simple-udp.h"
+#include "net/ip/simple-udp.h"
 
 #include <string.h>
 

diff --git 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
@@ -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>

diff --git 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
@@ -37,7 +37,7 @@
  *         Joakim Eriksson <[email protected]>
  */
 
-#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
@@ -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);

diff --git a/core/net/ip/uip-packetqueue.c b/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);

diff --git a/core/net/ip/uip-split.c b/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])
 

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

diff --git 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
@@ -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
@@ -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.