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
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

6
examples/ipv6/native-border-router/border-router.c
View file

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

2
examples/ipv6/native-border-router/border-router.h
View file

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

6
examples/ipv6/native-border-router/tun-bridge.c
View file

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

6
examples/ipv6/rpl-border-router/border-router.c
View file

@ -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};

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

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

8
examples/ipv6/rpl-collect/udp-sender.c
View file

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

4
examples/ipv6/rpl-collect/udp-sink.c
View file

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

8
examples/ipv6/rpl-udp/udp-client.c
View file

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

4
examples/ipv6/rpl-udp/udp-server.c
View file

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

4
examples/ipv6/simple-udp-rpl/broadcast-example.c
View file

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

6
examples/ipv6/simple-udp-rpl/unicast-receiver.c
View file

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

6
examples/ipv6/simple-udp-rpl/unicast-sender.c
View file

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

2
examples/ipv6/sky-websense/wget.c
View file

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

2
examples/ipv6/slip-radio/slip-net.c
View file

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

6
examples/ipv6/slip-radio/slip-radio.c
View file

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