deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated include paths for the moved files under net/

Browse source
This commit is contained in:
Adam Dunkels 2013-11-22 09:17:54 +01:00
parent afdeed1c64
commit 5f3fe7f7c7
176 changed files with 342 additions and 338 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/antelope/aql-adt.c
View file

@ -42,7 +42,7 @@
#include "aql.h" #include "aql.h"
#define DEBUG DEBUG_NONE #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 unsigned char char_buf[DB_MAX_CHAR_SIZE_PER_ROW];
static uint8_t next_free_offset; static uint8_t next_free_offset;

2
apps/antelope/aql-exec.c
View file

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

2
apps/antelope/index-inline.c
View file

@ -48,7 +48,7 @@
#include "storage.h" #include "storage.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
struct search_handle { struct search_handle {
index_t *index; index_t *index;

2
apps/antelope/index-maxheap.c
View file

@ -64,7 +64,7 @@
#include "storage.h" #include "storage.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#define BRANCH_FACTOR 2 #define BRANCH_FACTOR 2
#define BUCKET_SIZE 128 #define BUCKET_SIZE 128

2
apps/antelope/index-memhash.c
View file

@ -42,7 +42,7 @@
#include "index.h" #include "index.h"
#define DEBUG DEBUG_NONE #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 create(index_t *);
static db_result_t destroy(index_t *); static db_result_t destroy(index_t *);

2
apps/antelope/index.c
View file

@ -40,7 +40,7 @@
#include "lib/list.h" #include "lib/list.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "antelope.h" #include "antelope.h"
#include "attribute.h" #include "attribute.h"

2
apps/antelope/relation.c
View file

@ -42,7 +42,7 @@
#include "lib/memb.h" #include "lib/memb.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "db-options.h" #include "db-options.h"
#include "index.h" #include "index.h"

2
apps/antelope/result.c
View file

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

2
apps/antelope/storage-cfs.c
View file

@ -43,7 +43,7 @@
#include "lib/random.h" #include "lib/random.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "db-options.h" #include "db-options.h"
#include "storage.h" #include "storage.h"

2
apps/codeprop/codeprop.c
View file

@ -71,7 +71,7 @@
#include "sys/clock.h" #include "sys/clock.h"
#include "loader/elfloader.h" #include "loader/elfloader.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "dev/eeprom.h" #include "dev/eeprom.h"
#include "dev/leds.h" #include "dev/leds.h"

2
apps/codeprop/tcp_loader.c
View file

@ -37,7 +37,7 @@
#include "sys/etimer.h" #include "sys/etimer.h"
#include "loader/elfloader_compat.h" #include "loader/elfloader_compat.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "dev/xmem.h" #include "dev/xmem.h"

2
apps/codeprop/tcp_loader2.c
View file

@ -39,7 +39,7 @@
#include "loader/cle.h" #include "loader/cle.h"
#include "loader/cmod.h" #include "loader/cmod.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "dev/xmem.h" #include "dev/xmem.h"

2
apps/dhcp/dhcp.c
View file

@ -1,6 +1,6 @@
#include "contiki-net.h" #include "contiki-net.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "net/dhcpc.h" #include "net/ip/dhcpc.h"

2
apps/ftp/ftp.c
View file

@ -40,7 +40,7 @@
#include "contiki.h" #include "contiki.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "net/resolv.h" #include "net/ip/resolv.h"
#define MAX_USERNAMELEN 16 #define MAX_USERNAMELEN 16
#define MAX_PASSWORDLEN 16 #define MAX_PASSWORDLEN 16

4
apps/servreg-hack/servreg-hack.c
View file

@ -44,9 +44,9 @@
#include "contiki-lib.h" #include "contiki-lib.h"
#include "contiki-net.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" #include "servreg-hack.h"

2
apps/servreg-hack/servreg-hack.h
View file

@ -64,7 +64,7 @@
#define SERVREG_HACK_H #define SERVREG_HACK_H
#include "contiki-conf.h" #include "contiki-conf.h"
#include "net/uip.h" #include "net/ip/uip.h"
typedef uint8_t servreg_hack_id_t; typedef uint8_t servreg_hack_id_t;
typedef void servreg_hack_item_t; typedef void servreg_hack_item_t;

2
apps/slip-cmd/packetutils.c
View file

@ -30,7 +30,7 @@
#include "contiki.h" #include "contiki.h"
#include "net/packetbuf.h" #include "net/packetbuf.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int

24
core/contiki-net.h
View file

@ -36,23 +36,23 @@
#include "contiki.h" #include "contiki.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h" #include "net/ipv4/uip-fw-drv.h"
#include "net/uip_arp.h" #include "net/ipv4/uip_arp.h"
#include "net/uiplib.h" #include "net/ip/uiplib.h"
#include "net/uip-udp-packet.h" #include "net/ip/uip-udp-packet.h"
#include "net/simple-udp.h" #include "net/ip/simple-udp.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#include "net/uip-icmp6.h" #include "net/ipv6/uip-icmp6.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#endif /* UIP_CONF_IPV6 */ #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" #include "net/rime.h"

4
core/dev/slip.c
View file

@ -37,8 +37,8 @@
#include "contiki.h" #include "contiki.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
#include "dev/slip.h" #include "dev/slip.h"

2
core/net/ip/dhcpc.c
View file

@ -35,7 +35,7 @@
#include "contiki.h" #include "contiki.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "net/dhcpc.h" #include "net/ip/dhcpc.h"
#define STATE_INITIAL 0 #define STATE_INITIAL 0
#define STATE_SENDING 1 #define STATE_SENDING 1

2
core/net/ip/psock.c
View file

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

8
core/net/ip/resolv.c
View file

@ -62,9 +62,9 @@
* *
*/ */
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/resolv.h" #include "net/ip/resolv.h"
#include "net/uip-udp-packet.h" #include "net/ip/uip-udp-packet.h"
#include "lib/random.h" #include "lib/random.h"
#ifndef DEBUG #ifndef DEBUG
@ -318,7 +318,7 @@ static const uip_ipaddr_t resolv_mdns_addr =
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
{ { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, { { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb } }; 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb } };
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#else /* UIP_CONF_IPV6 */ #else /* UIP_CONF_IPV6 */
{ { 224, 0, 0, 251 } }; { { 224, 0, 0, 251 } };
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */

2
core/net/ip/simple-udp.c
View file

@ -42,7 +42,7 @@
*/ */
#include "contiki-net.h" #include "contiki-net.h"
#include "net/simple-udp.h" #include "net/ip/simple-udp.h"
#include <string.h> #include <string.h>

2
core/net/ip/simple-udp.h
View file

@ -53,7 +53,7 @@
#ifndef SIMPLE_UDP_H #ifndef SIMPLE_UDP_H
#define SIMPLE_UDP_H #define SIMPLE_UDP_H
#include "net/uip.h" #include "net/ip/uip.h"
struct simple_udp_connection; struct simple_udp_connection;

10
core/net/ip/tcpip.c
View file

@ -39,18 +39,18 @@
*/ */
#include "contiki-net.h" #include "contiki-net.h"
#include "net/uip-split.h" #include "net/ip/uip-split.h"
#include "net/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#include "net/uip-nd6.h" #include "net/ipv6/uip-nd6.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#endif #endif
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_LOGGING #if UIP_LOGGING
#include <stdio.h> #include <stdio.h>

2
core/net/ip/tcpip.h
View file

@ -84,7 +84,7 @@ struct tcpip_uipstate {
typedef struct tcpip_uipstate uip_udp_appstate_t; typedef struct tcpip_uipstate uip_udp_appstate_t;
typedef struct tcpip_uipstate uip_tcp_appstate_t; typedef struct tcpip_uipstate uip_tcp_appstate_t;
typedef struct tcpip_uipstate uip_icmp6_appstate_t; typedef struct tcpip_uipstate uip_icmp6_appstate_t;
#include "net/uip.h" #include "net/ip/uip.h"
void tcpip_uipcall(void); void tcpip_uipcall(void);
/** /**

2
core/net/ip/uip-debug.c
View file

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

2
core/net/ip/uip-debug.h
View file

@ -41,7 +41,7 @@
#ifndef UIP_DEBUG_H #ifndef UIP_DEBUG_H
#define UIP_DEBUG_H #define UIP_DEBUG_H
#include "net/uip.h" #include "net/ip/uip.h"
#include <stdio.h> #include <stdio.h>
void uip_debug_ipaddr_print(const uip_ipaddr_t *addr); void uip_debug_ipaddr_print(const uip_ipaddr_t *addr);

4
core/net/ip/uip-packetqueue.c
View file

@ -1,10 +1,10 @@
#include <stdio.h> #include <stdio.h>
#include "net/uip.h" #include "net/ip/uip.h"
#include "lib/memb.h" #include "lib/memb.h"
#include "net/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#define MAX_NUM_QUEUED_PACKETS 2 #define MAX_NUM_QUEUED_PACKETS 2
MEMB(packets_memb, struct uip_packetqueue_packet, MAX_NUM_QUEUED_PACKETS); MEMB(packets_memb, struct uip_packetqueue_packet, MAX_NUM_QUEUED_PACKETS);

10
core/net/ip/uip-split.c
View file

@ -34,12 +34,12 @@
#include <string.h> #include <string.h>
#include "net/uip-split.h" #include "net/ip/uip-split.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/uip_arch.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]) #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])

2
core/net/ip/uip-udp-packet.c
View file

@ -41,7 +41,7 @@
extern uint16_t uip_slen; extern uint16_t uip_slen;
#include "net/uip-udp-packet.h" #include "net/ip/uip-udp-packet.h"
#include <string.h> #include <string.h>

2
core/net/ip/uip-udp-packet.h
View file

@ -40,7 +40,7 @@
#ifndef UIP_UDP_PACKET_H_ #ifndef UIP_UDP_PACKET_H_
#define 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_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, void uip_udp_packet_sendto(struct uip_udp_conn *c, const void *data, int len,

4
core/net/ip/uip.h
View file

@ -90,7 +90,7 @@
#endif /*UIP_CONF_IPV6*/ #endif /*UIP_CONF_IPV6*/
#include "net/uipopt.h" #include "net/ip/uipopt.h"
/** /**
* Representation of an IP address. * 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_80211*/
#endif /*UIP_CONF_LL_802154*/ #endif /*UIP_CONF_LL_802154*/
#include "net/tcpip.h" #include "net/ip/tcpip.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* First, the functions that should be called from the /* First, the functions that should be called from the

2
core/net/ip/uip_arch.h
View file

@ -60,7 +60,7 @@
#ifndef UIP_ARCH_H_ #ifndef UIP_ARCH_H_
#define UIP_ARCH_H_ #define UIP_ARCH_H_
#include "net/uip.h" #include "net/ip/uip.h"
/** /**
* Carry out a 32-bit addition. * Carry out a 32-bit addition.

6
core/net/ip/uiplib.c
View file

@ -33,12 +33,12 @@
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uiplib.h" #include "net/ip/uiplib.h"
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6

2
core/net/ip/uiplib.h
View file

@ -42,7 +42,7 @@
#ifndef UIPLIB_H_ #ifndef UIPLIB_H_
#define UIPLIB_H_ #define UIPLIB_H_
#include "net/uip.h" #include "net/ip/uip.h"
/** /**
* \addtogroup uipconvfunc * \addtogroup uipconvfunc

2
core/net/ipv4/uaodv-def.h
View file

@ -40,7 +40,7 @@
#ifndef UAODV_DEF_H_ #ifndef UAODV_DEF_H_
#define UAODV_DEF_H_ #define UAODV_DEF_H_
#include "net/uip.h" #include "net/ip/uip.h"
#define NUM_PRECURSORS 4 #define NUM_PRECURSORS 4

2
core/net/ipv4/uaodv-rt.c
View file

@ -38,7 +38,7 @@
*/ */
#include "net/uaodv-rt.h" #include "net/ipv4/uaodv-rt.h"
#include "contiki-net.h" #include "contiki-net.h"
#ifndef UAODV_NUM_RT_ENTRIES #ifndef UAODV_NUM_RT_ENTRIES

4
core/net/ipv4/uaodv.c
View file

@ -41,8 +41,8 @@
#include <stdarg.h> #include <stdarg.h>
#include "contiki.h" #include "contiki.h"
#include "net/uaodv-def.h" #include "net/ipv4/uaodv-def.h"
#include "net/uaodv-rt.h" #include "net/ipv4/uaodv-rt.h"
#define NDEBUG #define NDEBUG
#include "lib/assert.h" #include "lib/assert.h"

2
core/net/ipv4/uip-fw-drv.c
View file

@ -32,7 +32,7 @@
* *
*/ */
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#if !UIP_CONF_IPV6 #if !UIP_CONF_IPV6

2
core/net/ipv4/uip-fw-drv.h
View file

@ -35,7 +35,7 @@
#define UIP_FW_DRV_H_ #define UIP_FW_DRV_H_
#include "contiki.h" #include "contiki.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
PROCESS_NAME(uip_fw_process); PROCESS_NAME(uip_fw_process);

8
core/net/ipv4/uip-fw.c
View file

@ -56,11 +56,11 @@
#include "contiki-conf.h" #include "contiki-conf.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip_arch.h" #include "net/ip/uip_arch.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#ifdef AODV_COMPLIANCE #ifdef AODV_COMPLIANCE
#include "net/uaodv-def.h" #include "net/ipv4/uaodv-def.h"
#endif #endif
/* /*

2
core/net/ipv4/uip-fw.h
View file

@ -45,7 +45,7 @@
#ifndef UIP_FW_H_ #ifndef UIP_FW_H_
#define UIP_FW_H_ #define UIP_FW_H_
#include "net/uip.h" #include "net/ip/uip.h"
/** /**
* Representation of a uIP network interface. * Representation of a uIP network interface.

2
core/net/ipv4/uip-neighbor.c
View file

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

2
core/net/ipv4/uip-neighbor.h
View file

@ -41,7 +41,7 @@
#ifndef UIP_NEIGHBOR_H_ #ifndef UIP_NEIGHBOR_H_
#define UIP_NEIGHBOR_H_ #define UIP_NEIGHBOR_H_
#include "net/uip.h" #include "net/ip/uip.h"
struct uip_neighbor_addr { struct uip_neighbor_addr {
#if UIP_NEIGHBOR_CONF_ADDRTYPE #if UIP_NEIGHBOR_CONF_ADDRTYPE

4
core/net/ipv4/uip-over-mesh.c
View file

@ -39,8 +39,8 @@
#include <stdio.h> #include <stdio.h>
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/uip-over-mesh.h" #include "net/ipv4/uip-over-mesh.h"
#include "net/rime/route-discovery.h" #include "net/rime/route-discovery.h"
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/rime/trickle.h" #include "net/rime/trickle.h"

4
core/net/ipv4/uip-over-mesh.h
View file

@ -40,8 +40,8 @@
#ifndef UIP_OVER_MESH_H_ #ifndef UIP_OVER_MESH_H_
#define UIP_OVER_MESH_H_ #define UIP_OVER_MESH_H_
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/rime.h" #include "net/rime.h"
void uip_over_mesh_init(uint16_t channels); void uip_over_mesh_init(uint16_t channels);

10
core/net/ipv4/uip.c
View file

@ -70,10 +70,10 @@
* the packet back to the peer. * the packet back to the peer.
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uipopt.h" #include "net/ip/uipopt.h"
#include "net/uip_arp.h" #include "net/ipv4/uip_arp.h"
#include "net/uip_arch.h" #include "net/ip/uip_arch.h"
#if !UIP_CONF_IPV6 /* If UIP_CONF_IPV6 is defined, we compile the #if !UIP_CONF_IPV6 /* If UIP_CONF_IPV6 is defined, we compile the
uip6.c file instead of this one. Therefore uip6.c file instead of this one. Therefore
@ -82,7 +82,7 @@
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#include "net/uip-neighbor.h" #include "net/ipv4/uip-neighbor.h"
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
#include <string.h> #include <string.h>

2
core/net/ipv4/uip_arp.c
View file

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

2
core/net/ipv4/uip_arp.h
View file

@ -51,7 +51,7 @@
#ifndef UIP_ARP_H_ #ifndef UIP_ARP_H_
#define UIP_ARP_H_ #define UIP_ARP_H_
#include "net/uip.h" #include "net/ip/uip.h"

10
core/net/ipv6/sicslowpan.c
View file

@ -60,11 +60,11 @@
#include "contiki.h" #include "contiki.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/rime.h" #include "net/rime.h"
#include "net/sicslowpan.h" #include "net/ipv6/sicslowpan.h"
#include "net/netstack.h" #include "net/netstack.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
@ -72,7 +72,7 @@
#include <stdio.h> #include <stdio.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#if DEBUG #if DEBUG
/* PRINTFI and PRINTFO are defined for input and output to debug one without changing the timing of the other */ /* PRINTFI and PRINTFO are defined for input and output to debug one without changing the timing of the other */
uint8_t p; uint8_t p;

3
core/net/ipv6/sicslowpan.h
View file

@ -47,7 +47,8 @@
#ifndef SICSLOWPAN_H_ #ifndef SICSLOWPAN_H_
#define SICSLOWPAN_H_ #define SICSLOWPAN_H_
#include "net/uip.h"
#include "net/ip/uip.h"
#include "net/mac/mac.h" #include "net/mac/mac.h"
/** /**

4
core/net/ipv6/uip-ds6-nbr.c
View file

@ -49,10 +49,10 @@
#include "lib/list.h" #include "lib/list.h"
#include "net/rime/rimeaddr.h" #include "net/rime/rimeaddr.h"
#include "net/packetbuf.h" #include "net/packetbuf.h"
#include "net/uip-ds6-nbr.h" #include "net/ipv6/uip-ds6-nbr.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#ifdef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED #ifdef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED
#define NEIGHBOR_STATE_CHANGED(n) UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED(n) #define NEIGHBOR_STATE_CHANGED(n) UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED(n)

6
core/net/ipv6/uip-ds6-nbr.h
View file

@ -46,14 +46,14 @@
#ifndef UIP_DS6_NEIGHBOR_H_ #ifndef UIP_DS6_NEIGHBOR_H_
#define UIP_DS6_NEIGHBOR_H_ #define UIP_DS6_NEIGHBOR_H_
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/nbr-table.h" #include "net/nbr-table.h"
#include "sys/stimer.h" #include "sys/stimer.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/nbr-table.h" #include "net/nbr-table.h"
#if UIP_CONF_IPV6_QUEUE_PKT #if UIP_CONF_IPV6_QUEUE_PKT
#include "net/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#endif /*UIP_CONF_QUEUE_PKT */ #endif /*UIP_CONF_QUEUE_PKT */
/*--------------------------------------------------*/ /*--------------------------------------------------*/

6
core/net/ipv6/uip-ds6-route.c
View file

@ -29,8 +29,8 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "lib/list.h" #include "lib/list.h"
#include "lib/memb.h" #include "lib/memb.h"
@ -67,7 +67,7 @@ static int num_routes = 0;
#undef DEBUG #undef DEBUG
#define DEBUG DEBUG_NONE #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); static void rm_routelist_callback(nbr_table_item_t *ptr);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

8
core/net/ipv6/uip-ds6.c
View file

@ -44,14 +44,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include "lib/random.h" #include "lib/random.h"
#include "net/uip-nd6.h" #include "net/ipv6/uip-nd6.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#define DEBUG DEBUG_NONE #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 */ struct etimer uip_ds6_timer_periodic; /** \brief Timer for maintenance of data structures */

10
core/net/ipv6/uip-ds6.h
View file

@ -42,12 +42,12 @@
#ifndef UIP_DS6_H_ #ifndef UIP_DS6_H_
#define UIP_DS6_H_ #define UIP_DS6_H_
#include "net/uip.h" #include "net/ip/uip.h"
#include "sys/stimer.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. */ /* 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/ipv6/uip-nd6.h"
#include "net/uip-ds6-route.h" #include "net/ipv6/uip-ds6-route.h"
#include "net/uip-ds6-nbr.h" #include "net/ipv6/uip-ds6-nbr.h"
/*--------------------------------------------------*/ /*--------------------------------------------------*/
/** Configuration. For all tables (Neighbor cache, Prefix List, Routing Table, /** Configuration. For all tables (Neighbor cache, Prefix List, Routing Table,
@ -138,7 +138,7 @@
/*--------------------------------------------------*/ /*--------------------------------------------------*/
#if UIP_CONF_IPV6_QUEUE_PKT #if UIP_CONF_IPV6_QUEUE_PKT
#include "net/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#endif /*UIP_CONF_QUEUE_PKT */ #endif /*UIP_CONF_QUEUE_PKT */
/** \brief A prefix list entry */ /** \brief A prefix list entry */

4
core/net/ipv6/uip-icmp6.c
View file

@ -43,8 +43,8 @@
*/ */
#include <string.h> #include <string.h>
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/uip-icmp6.h" #include "net/ipv6/uip-icmp6.h"
#include "contiki-default-conf.h" #include "contiki-default-conf.h"
#define DEBUG 0 #define DEBUG 0

2
core/net/ipv6/uip-icmp6.h
View file

@ -46,7 +46,7 @@
#ifndef ICMP6_H_ #ifndef ICMP6_H_
#define ICMP6_H_ #define ICMP6_H_
#include "net/uip.h" #include "net/ip/uip.h"
/** \name ICMPv6 message types */ /** \name ICMPv6 message types */

8
core/net/ipv6/uip-nd6.c
View file

@ -69,15 +69,15 @@
*/ */
#include <string.h> #include <string.h>
#include "net/uip-icmp6.h" #include "net/ipv6/uip-icmp6.h"
#include "net/uip-nd6.h" #include "net/ipv6/uip-nd6.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "lib/random.h" #include "lib/random.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
#define DEBUG 0 #define DEBUG 0
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_LOGGING #if UIP_LOGGING
#include <stdio.h> #include <stdio.h>

2
core/net/ipv6/uip-nd6.h
View file

@ -45,7 +45,7 @@
#ifndef UIP_ND6_H_ #ifndef UIP_ND6_H_
#define UIP_ND6_H_ #define UIP_ND6_H_
#include "net/uip.h" #include "net/ip/uip.h"
#include "sys/stimer.h" #include "sys/stimer.h"
/** /**
* \name General * \name General

12
core/net/ipv6/uip6.c
View file

@ -70,11 +70,11 @@
* the packet back to the peer. * the packet back to the peer.
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uipopt.h" #include "net/ip/uipopt.h"
#include "net/uip-icmp6.h" #include "net/ipv6/uip-icmp6.h"
#include "net/uip-nd6.h" #include "net/ipv6/uip-nd6.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include <string.h> #include <string.h>
@ -84,7 +84,7 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_CONF_IPV6_RPL #if UIP_CONF_IPV6_RPL
#include "rpl/rpl.h" #include "rpl/rpl.h"

3
core/net/mac/nullmac.c
View file

@ -38,6 +38,9 @@
*/ */
#include "net/mac/nullmac.h" #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/packetbuf.h"
#include "net/netstack.h" #include "net/netstack.h"

4
core/net/rime/rime-udp.c
View file

@ -39,8 +39,8 @@
#include <string.h> #include <string.h>
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-udp-packet.h" #include "net/ip/uip-udp-packet.h"
#include "net/uip-netif.h" #include "net/uip-netif.h"
#include "net/rime/rime-udp.h" #include "net/rime/rime-udp.h"
#include "net/packetbuf.h" #include "net/packetbuf.h"

6
core/net/rpl/rpl-dag.c
View file

@ -43,8 +43,8 @@
#include "contiki.h" #include "contiki.h"
#include "net/rpl/rpl-private.h" #include "net/rpl/rpl-private.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-nd6.h" #include "net/ipv6/uip-nd6.h"
#include "net/nbr-table.h" #include "net/nbr-table.h"
#include "lib/list.h" #include "lib/list.h"
#include "lib/memb.h" #include "lib/memb.h"
@ -54,7 +54,7 @@
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

8
core/net/rpl/rpl-ext-header.c
View file

@ -42,13 +42,13 @@
* Nicolas Tsiftes <nvt@sics.se>. * Nicolas Tsiftes <nvt@sics.se>.
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/rpl/rpl-private.h" #include "net/rpl/rpl-private.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>

12
core/net/rpl/rpl-icmp6.c
View file

@ -42,11 +42,11 @@
* Mathieu Pouillot <m.pouillot@watteco.com> * Mathieu Pouillot <m.pouillot@watteco.com>
*/ */
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/uip-nd6.h" #include "net/ipv6/uip-nd6.h"
#include "net/uip-icmp6.h" #include "net/ipv6/uip-icmp6.h"
#include "net/rpl/rpl-private.h" #include "net/rpl/rpl-private.h"
#include "net/packetbuf.h" #include "net/packetbuf.h"
@ -55,7 +55,7 @@
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
core/net/rpl/rpl-mrhof.c
View file

@ -48,7 +48,7 @@
#include "net/nbr-table.h" #include "net/nbr-table.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
static void reset(rpl_dag_t *); static void reset(rpl_dag_t *);
static void neighbor_link_callback(rpl_parent_t *, int, int); static void neighbor_link_callback(rpl_parent_t *, int, int);

2
core/net/rpl/rpl-of0.c
View file

@ -42,7 +42,7 @@
#include "net/rpl/rpl-private.h" #include "net/rpl/rpl-private.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
static void reset(rpl_dag_t *); static void reset(rpl_dag_t *);
static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *); static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);

4
core/net/rpl/rpl-private.h
View file

@ -40,10 +40,10 @@
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"
#include "lib/list.h" #include "lib/list.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "sys/clock.h" #include "sys/clock.h"
#include "sys/ctimer.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 /** \brief Is IPv6 address addr the link-local, all-RPL-nodes

2
core/net/rpl/rpl-timers.c
View file

@ -47,7 +47,7 @@
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static struct ctimer periodic_timer; static struct ctimer periodic_timer;

8
core/net/rpl/rpl.c
View file

@ -40,13 +40,13 @@
* \author Joakim Eriksson <joakime@sics.se>, Nicolas Tsiftes <nvt@sics.se> * \author Joakim Eriksson <joakime@sics.se>, Nicolas Tsiftes <nvt@sics.se>
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/rpl/rpl-private.h" #include "net/rpl/rpl-private.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>

4
core/net/rpl/rpl.h
View file

@ -41,8 +41,8 @@
#include "rpl-conf.h" #include "rpl-conf.h"
#include "lib/list.h" #include "lib/list.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "sys/ctimer.h" #include "sys/ctimer.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
cpu/6502/ipconfig/ipconfig.c
View file

@ -35,7 +35,7 @@
#include "contiki-net.h" #include "contiki-net.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "net/dhcpc.h" #include "net/ip/dhcpc.h"
static struct ctk_window window; static struct ctk_window window;

2
cpu/6502/lib/log.c
View file

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

2
cpu/6502/net/ethernet-drv.c
View file

@ -34,7 +34,7 @@
#include "contiki-net.h" #include "contiki-net.h"
#include "net/ethernet.h" #include "net/ethernet.h"
#include "net/uip-neighbor.h" #include "net/ipv4/uip-neighbor.h"
#include "net/ethernet-drv.h" #include "net/ethernet-drv.h"

4
cpu/6502/net/uip_arch.c
View file

@ -32,8 +32,8 @@
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip_arch.h" #include "net/ip/uip_arch.h"
#define BUF ((uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define BUF ((uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
#define IP_PROTO_TCP 6 #define IP_PROTO_TCP 6

2
cpu/arm/common/usb/cdc-eth/cdc-eth.c
View file

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

2
cpu/arm/common/usb/cdc-eth/cdc-eth.h
View file

@ -1,7 +1,7 @@
#ifndef CDC_ETH_H_NUI0ULFC7C__ #ifndef CDC_ETH_H_NUI0ULFC7C__
#define 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 */ /* Should be called before usb_cdc_eth_setup */
void void

2
cpu/mc1322x/config.c
View file

@ -5,7 +5,7 @@
/* debug */ /* debug */
#define DEBUG DEBUG_FULL #define DEBUG DEBUG_FULL
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
mc1322xConfig mc1322x_config; mc1322xConfig mc1322x_config;

2
cpu/mc1322x/contiki-maca.c
View file

@ -39,7 +39,7 @@
/* debug */ /* debug */
#define DEBUG DEBUG_ANNOTATE #define DEBUG DEBUG_ANNOTATE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/* contiki */ /* contiki */
#include "radio.h" #include "radio.h"

2
cpu/mc1322x/init.c
View file

@ -2,7 +2,7 @@
/* debug */ /* debug */
#define DEBUG DEBUG_FULL #define DEBUG DEBUG_FULL
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/* contiki */ /* contiki */
#include "sys/process.h" #include "sys/process.h"

2
cpu/msp430/loader-arch.c
View file

@ -33,7 +33,7 @@
#include "contiki.h" #include "contiki.h"
#include "sys/clock.h" #include "sys/clock.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "dev/eeprom.h" #include "dev/eeprom.h"

2
cpu/msp430/uip-ipchksum.c
View file

@ -35,7 +35,7 @@
* uIP checksum calculation for MSP430 * uIP checksum calculation for MSP430
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#define asmv(arg) __asm__ __volatile__(arg) #define asmv(arg) __asm__ __volatile__(arg)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

4
cpu/native/net/tapdev-drv.c
View file

@ -31,8 +31,8 @@
*/ */
#include "contiki-net.h" #include "contiki-net.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uipopt.h" #include "net/ip/uipopt.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#include "tapdev6.h" #include "tapdev6.h"

4
cpu/native/net/tapdev.c
View file

@ -33,8 +33,8 @@
* *
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uipopt.h" #include "net/ip/uipopt.h"
#if !UIP_CONF_IPV6 #if !UIP_CONF_IPV6

4
cpu/native/net/tapdev6.c
View file

@ -33,8 +33,8 @@
* *
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uipopt.h" #include "net/ip/uipopt.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6

2
cpu/native/net/wpcap-drv.c
View file

@ -31,7 +31,7 @@
*/ */
#include "contiki-net.h" #include "contiki-net.h"
#include "net/uip-neighbor.h" #include "net/ipv4/uip-neighbor.h"
#include "net/wpcap.h" #include "net/wpcap.h"
#include "net/wpcap-drv.h" #include "net/wpcap-drv.h"

2
cpu/stm32w108/clock.c
View file

@ -56,7 +56,7 @@
#include "dev/stm32w-radio.h" #include "dev/stm32w-radio.h"
#define DEBUG DEBUG_NONE #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. */ /* The value that will be load in the SysTick value register. */

4
cpu/stm32w108/uip-arch.c
View file

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

2
examples/cc2530dk/border-router/border-router.c
View file

@ -34,7 +34,7 @@
#include <string.h> #include <string.h>
#define DEBUG DEBUG_PRINT #define DEBUG DEBUG_PRINT
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "dev/slip.h" #include "dev/slip.h"

6
examples/cc2530dk/border-router/slip-bridge.c
View file

@ -38,8 +38,8 @@
* Nicolas Tsiftes <nvt@sics.se> * Nicolas Tsiftes <nvt@sics.se>
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"
#include "dev/slip.h" #include "dev/slip.h"
#include <string.h> #include <string.h>
@ -47,7 +47,7 @@
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
void set_prefix_64(uip_ipaddr_t *); void set_prefix_64(uip_ipaddr_t *);

2
examples/cc2530dk/sniffer/sniffer.c
View file

@ -31,7 +31,7 @@
#include "cc253x.h" #include "cc253x.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(sniffer_process, "Sniffer process"); PROCESS(sniffer_process, "Sniffer process");

2
examples/cc2530dk/udp-ipv6/client.c
View file

@ -37,7 +37,7 @@
#include "debug.h" #include "debug.h"
#define DEBUG DEBUG_PRINT #define DEBUG DEBUG_PRINT
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#define SEND_INTERVAL 2 * CLOCK_SECOND #define SEND_INTERVAL 2 * CLOCK_SECOND
#define MAX_PAYLOAD_LEN 40 #define MAX_PAYLOAD_LEN 40

2
examples/cc2530dk/udp-ipv6/ping6.c
View file

@ -37,7 +37,7 @@
#include "debug.h" #include "debug.h"
#define DEBUG DEBUG_PRINT #define DEBUG DEBUG_PRINT
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#define PING6_NB 5 #define PING6_NB 5
#define PING6_DATALEN 16 #define PING6_DATALEN 16

2
examples/cc2530dk/udp-ipv6/server.c
View file

@ -34,7 +34,7 @@
#include <string.h> #include <string.h>
#define DEBUG DEBUG_PRINT #define DEBUG DEBUG_PRINT
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"

2
examples/cc2538dk/sniffer/sniffer.c
View file

@ -48,7 +48,7 @@
#include "contiki.h" #include "contiki.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(sniffer_process, "Sniffer process"); PROCESS(sniffer_process, "Sniffer process");
AUTOSTART_PROCESSES(&sniffer_process); AUTOSTART_PROCESSES(&sniffer_process);

2
examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c
View file

@ -47,7 +47,7 @@
#include <string.h> #include <string.h>
#define DEBUG DEBUG_PRINT #define DEBUG DEBUG_PRINT
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"

2
examples/ipv6/json-ws/json-ws-udp.c
View file

@ -48,7 +48,7 @@
#include <string.h> #include <string.h>
#define DEBUG DEBUG_FULL #define DEBUG DEBUG_FULL
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
static struct uip_udp_conn *client_conn; static struct uip_udp_conn *client_conn;
static uip_ipaddr_t server_ipaddr; static uip_ipaddr_t server_ipaddr;

4
examples/ipv6/native-border-router/border-router-cmds.c
View file

@ -41,11 +41,11 @@
#include "border-router-cmds.h" #include "border-router-cmds.h"
#include "dev/serial-line.h" #include "dev/serial-line.h"
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"
#include "net/uiplib.h" #include "net/ip/uiplib.h"
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
uint8_t command_context; uint8_t command_context;

Some files were not shown because too many files have changed in this diff Show more