giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #72 from simonduq/pr/ip-reorg

Browse Source 
Restructure ip implementation
This commit is contained in:
Simon Duquennoy 2017-09-28 12:02:14 +02:00 committed by GitHub
commit a3afb0d13e
200 changed files with 299 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -120,7 +120,7 @@ ifeq ($(MAKE_NET),MAKE_NET_IPV6)
CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
CONTIKI_WITH_RPL ?= 1
CONTIKI_WITH_RPL_LITE ?= 1
MODULES += os/net/ipv6 os/net/ip
MODULES += os/net/ipv6
else
CFLAGS += -DNETSTACK_CONF_WITH_NULLNET=1
MODULES += os/net/nullnet
@ -170,6 +170,10 @@ else
include $(target_makefile)
endif
ifeq ($(WITH_IP64),1)
MODULES += os/services/ip64
endif
ifdef MODULES
UNIQUEMODULES = $(call uniq,$(MODULES))
MODULEDIRS = ${wildcard ${addprefix $(CONTIKI)/, $(UNIQUEMODULES)}}

2
arch/cpu/msp430/uip-ipchksum.c
View File

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

4
arch/cpu/native/net/tapdev-drv.c
View File

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

4
arch/cpu/native/net/tapdev.c
View File

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

4
arch/cpu/native/net/tapdev6.c
View File

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

4
arch/cpu/nrf52832/ble/ble-mac.c
View File

@ -46,8 +46,8 @@
#include "net/mac/nullmac/nullmac.h"
#include "net/netstack.h"
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/packetbuf.h"
#include "net/netstack.h"
#include "net/linkaddr.h"

4
arch/dev/enc28j60/enc28j60-ip64-driver.c
View File

@ -34,8 +34,8 @@
#include "enc28j60-ip64-driver.h"
#include "linkaddr.h"
#include "ip64.h"
#include "ip64-eth.h"
#include "ip64/ip64.h"
#include "ip64/ip64-eth.h"
#include <string.h>
#include <stdio.h>

2
arch/dev/enc28j60/enc28j60-ip64-driver.h
View File

@ -32,7 +32,7 @@
#ifndef ENC28J60_IP64_DRIVER_H
#define ENC28J60_IP64_DRIVER_H
#include "ip64-driver.h"
#include "ip64/ip64-driver.h"
extern const struct ip64_driver enc28j60_ip64_driver;
#endif /* ENC28J60_IP64_DRIVER_H */

4
arch/platform/cc2538dk/contiki-main.c
View File

@ -60,8 +60,8 @@
#include "lib/random.h"
#include "net/netstack.h"
#include "net/queuebuf.h"
#include "net/ip/tcpip.h"
#include "net/ip/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip.h"
#include "net/mac/framer/frame802154.h"
#include "soc.h"
#include "cpu.h"

2
arch/platform/cooja-ip64/Makefile.cooja-ip64
View File

@ -1,6 +1,6 @@
COOJAPLATFORMDIR=$(CONTIKI)/arch/platform/cooja
MODULES += os/net/ip64
WITH_IP64 = 1
include $(COOJAPLATFORMDIR)/Makefile.cooja
vpath %.c $(COOJAPLATFORMDIR) $(COOJAPLATFORMDIR)/dev \

8
arch/platform/cooja-ip64/contiki-cooja-ip64-main.c
View File

@ -51,8 +51,8 @@
#include "net/netstack.h"
#include "net/queuebuf.h"
#include "net/ip/uip-nameserver.h"
#include "net/ip/ip64-addr.h"
#include "net/ipv6/uip-nameserver.h"
#include "net/ipv6/ip64-addr.h"
#include "dev/serial-line.h"
#include "dev/cooja-radio.h"
@ -63,7 +63,7 @@
#include "sys/node-id.h"
#include "ip64.h"
#include "ip64/ip64.h"
#include "dev/slip.h"
void log_set_putchar_with_slip(int with);
@ -81,7 +81,7 @@ void log_set_putchar_with_slip(int with);
#define Java_org_contikios_cooja_corecomm_CLASSNAME_tick COOJA__QUOTEME(COOJA_JNI_PATH,CLASSNAME,_tick)
#define Java_org_contikios_cooja_corecomm_CLASSNAME_setReferenceAddress COOJA__QUOTEME(COOJA_JNI_PATH,CLASSNAME,_setReferenceAddress)
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#define PRINT6ADDR(addr) printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])

4
arch/platform/cooja-ip64/ip64-conf.h
View File

@ -34,8 +34,8 @@
#undef UIP_FALLBACK_INTERFACE
#define UIP_FALLBACK_INTERFACE ip64_uip_fallback_interface
#include "ip64-slip-interface.h"
#include "ip64-null-driver.h"
#include "ip64/ip64-slip-interface.h"
#include "ip64/ip64-null-driver.h"
#define IP64_CONF_UIP_FALLBACK_INTERFACE_SLIP 1
#define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_slip_interface

4
arch/platform/cooja/Makefile.cooja
View File

@ -41,7 +41,7 @@ JNILIB = $(OBJECTDIR)/$(LIBNAME).$(TARGET)
CONTIKI_APP_OBJ = $(CONTIKI_APP).co
# Modules
MODULES += os/net os/net/mac os/net/mac/framer os/net/ip64-addr
MODULES += os/net os/net/mac os/net/mac/framer
## Copied from Makefile.include, since Cooja overrides CFLAGS et al
MAKE_NET_NULLNET = 0
@ -55,7 +55,7 @@ ifeq ($(MAKE_NET),MAKE_NET_IPV6)
CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
CONTIKI_WITH_RPL ?= 1
CONTIKI_WITH_RPL_LITE ?= 1
MODULES += os/net/ipv6 os/net/ip
MODULES += os/net/ipv6
COOJA_NET = uip-driver.c
else
COOJA_NET =

2
arch/platform/cooja/contiki-cooja-main.c
View File

@ -80,7 +80,7 @@
#define NETSTACK_CONF_WITH_IPV6 0
#endif
#if NETSTACK_CONF_WITH_IPV6
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#define PRINT6ADDR(addr) printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
#endif /* NETSTACK_CONF_WITH_IPV6 */

2
arch/platform/cooja/dev/ip.c
View File

@ -31,7 +31,7 @@
#include "dev/ip.h"
#include "lib/simEnvChange.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
const struct simInterface ip_interface;

4
arch/platform/cooja/net/uip-driver.c
View File

@ -37,8 +37,8 @@
*/
#include "net/netstack.h"
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/packetbuf.h"
#include "net/uip-driver.h"
#include <string.h>

2
arch/platform/cooja/testapps/testuip.c
View File

@ -29,7 +29,7 @@
*/
#include <stdlib.h>
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "dev/button-sensor.h"
#include "dev/leds.h"

2
arch/platform/jn516x/contiki-jn516x-main.c
View File

@ -57,7 +57,7 @@
#include "dev/serial-line.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "dev/leds.h"
#include "lib/random.h"

2
arch/platform/jn516x/dev/micromac-radio.c
View File

@ -60,7 +60,7 @@
* and acknowledging in software. */
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#ifdef MICROMAC_CONF_RADIO_MAC
#define MICROMAC_RADIO_MAC MICROMAC_CONF_RADIO_MAC

2
arch/platform/jn516x/lib/slip.c
View File

@ -45,7 +45,7 @@
#include "contiki.h"
#include <MicroInt.h>
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
#include "dev/slip.h"

2
arch/platform/native/Makefile.native
View File

@ -45,4 +45,4 @@ CURSES_LIBS ?= -lncurses
TARGET_LIBFILES += $(CURSES_LIBS)
MODULES+=os/net os/net/mac os/net/mac/framer os/net/ip64-addr/
MODULES+=os/net os/net/mac os/net/mac/framer

2
arch/platform/native/contiki-main.c
View File

@ -57,7 +57,7 @@
#include "dev/serial-line.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/queuebuf.h"
#include "dev/button-sensor.h"

4
arch/platform/openmote-cc2538/contiki-main.c
View File

@ -63,8 +63,8 @@
#include "lib/random.h"
#include "net/netstack.h"
#include "net/queuebuf.h"
#include "net/ip/tcpip.h"
#include "net/ip/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip.h"
#include "net/mac/framer/frame802154.h"
#include "soc.h"
#include "cpu.h"

4
arch/platform/zoul/Makefile.zoul
View File

@ -49,10 +49,6 @@ MODULES += os/net os/net/mac os/net/mac/framer \
arch/dev/cc1200 \
os/storage/cfs
ifeq ($(WITH_IP64),1)
MODULES += os/net/ip64
endif
BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
### Use the specific Zoul subplatform to query for connected devices

4
arch/platform/zoul/contiki-main.c
View File

@ -62,8 +62,8 @@
#include "lib/random.h"
#include "net/netstack.h"
#include "net/queuebuf.h"
#include "net/ip/tcpip.h"
#include "net/ip/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip.h"
#include "net/mac/framer/frame802154.h"
#include "soc.h"
#include "cpu.h"

2
arch/platform/zoul/orion/ip64-conf.h
View File

@ -34,7 +34,7 @@
#ifndef IP64_CONF_H
#define IP64_CONF_H
/*---------------------------------------------------------------------------*/
#include "ip64-eth-interface.h"
#include "ip64/ip64-eth-interface.h"
/*---------------------------------------------------------------------------*/
#define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_eth_interface
#define IP64_CONF_INPUT ip64_eth_interface_input

2
examples/http-socket/http-example.c
View File

@ -1,6 +1,6 @@
#include "contiki-net.h"
#include "http-socket.h"
#include "ip64-addr.h"
#include "ipv6/ip64-addr.h"
#include <stdio.h>

2
examples/ip64-router/ip64-router.c
View File

@ -1,6 +1,6 @@
#include "contiki.h"
#include "contiki-net.h"
#include "ip64.h"
#include "ip64/ip64.h"
#include "net/netstack.h"
#include "rpl-dag-root.h"
#include "sys/autostart.h"

2
examples/ipso-objects/example-ipso-objects.c
View File

@ -41,7 +41,7 @@
#include "services/ipso-objects/ipso-objects.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#ifndef REGISTER_WITH_LWM2M_BOOTSTRAP_SERVER
#define REGISTER_WITH_LWM2M_BOOTSTRAP_SERVER 0

4
examples/ipso-objects/example-server.c
View File

@ -37,7 +37,7 @@
*/
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/netstack.h"
@ -53,7 +53,7 @@
#endif
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define REMOTE_PORT UIP_HTONS(COAP_DEFAULT_PORT)

4
examples/ipso-objects/serial-protocol.c
View File

@ -36,8 +36,8 @@
*/
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ip/uiplib.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uiplib.h"
#include <stdio.h>
void print_node_list(void);

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

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

2
examples/ipv6/multicast/root.c
View File

@ -47,7 +47,7 @@
#include <string.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#include "rpl.h"
#include "rpl-dag-root.h"

2
examples/ipv6/multicast/sink.c
View File

@ -48,7 +48,7 @@
#include <string.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define MCAST_SINK_UDP_PORT 3001 /* Host byte order */

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

4
examples/ipv6/native-border-router/border-router.c
View File

@ -41,7 +41,7 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#include "rpl-dag-root.h"
@ -58,7 +58,7 @@
#include <ctype.h>
#define DEBUG DEBUG_FULL
#include "net/ip/uip-debug.h"
#include "net/ipv6/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/ip/uip.h"
#include "net/ipv6/uip.h"
#include <stdio.h>
int border_router_cmd_handler(const uint8_t *data, int len);

4
examples/ipv6/native-border-router/tun-bridge.c
View File

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

4
examples/ipv6/rpl-border-router/border-router.c
View File

@ -38,7 +38,7 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
@ -58,7 +58,7 @@
#include <ctype.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
static uip_ipaddr_t prefix;
static uint8_t prefix_set;

4
examples/ipv6/rpl-border-router/slip-bridge.c
View File

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

4
examples/ipv6/rpl-simple/node.c
View File

@ -30,9 +30,9 @@
#include "contiki.h"
#include "lib/random.h"
#include "sys/ctimer.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ipv6/uip-udp-packet.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "node-id.h"

2
examples/ipv6/rpl-tsch-sixtop/node-sixtop.c
View File

@ -45,7 +45,7 @@
#include "net/mac/tsch/tsch-schedule.h"
#include "net/mac/tsch/sixtop/sixtop.h"
#include "net/rpl/rpl-private.h"
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#include "sf-simple.h"

2
examples/ipv6/rpl-tsch/node.c
View File

@ -55,7 +55,7 @@
#endif /* WITH_SHELL */
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
/*---------------------------------------------------------------------------*/
PROCESS(node_process, "RPL Node");

6
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/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ipv6/uip-udp-packet.h"
#include "sys/ctimer.h"
#include <stdio.h>
#include <string.h>
@ -46,7 +46,7 @@
#define UDP_EXAMPLE_ID 190
#define DEBUG DEBUG_FULL
#include "net/ip/uip-debug.h"
#include "net/ipv6/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/ip/uip.h"
#include "net/ipv6/uip.h"
#include "rpl.h"
#include "rpl-dag-root.h"
@ -42,7 +42,7 @@
#include <ctype.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])

2
examples/ipv6/slip-radio/Makefile
View File

@ -21,5 +21,5 @@ endif
MAKE_NET = MAKE_NET_OTHER
CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
CONTIKI_WITH_RPL = 0
MODULES += os/net/ipv6 os/net/ip
MODULES += os/net/ipv6
include $(CONTIKI)/Makefile.include

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

@ -29,7 +29,7 @@
#include "contiki.h"
#include "net/netstack.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/packetbuf.h"
#include "dev/slip.h"
#include <stdio.h>

4
examples/ipv6/slip-radio/slip-radio.c
View File

@ -35,7 +35,7 @@
* Joakim Eriksson <joakime@sics.se>
*/
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "dev/slip.h"
#include <string.h>
@ -43,7 +43,7 @@
#include "net/packetbuf.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#include "cmd.h"
#include "slip-radio.h"
#include "packetutils.h"

4
examples/ipv6/udp-ipv6/udp-client.c
View File

@ -30,13 +30,13 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "net/ip/resolv.h"
#include "net/ipv6/resolv.h"
#include <string.h>
#include <stdbool.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define SEND_INTERVAL 15 * CLOCK_SECOND
#define MAX_PAYLOAD_LEN 40

2
examples/ipv6/udp-ipv6/udp-server.c
View File

@ -34,7 +34,7 @@
#include <string.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])

2
examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
View File

@ -47,7 +47,7 @@
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "mqtt.h"
#include "rpl.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/sicslowpan.h"
#include "sys/etimer.h"

2
examples/platform-specific/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c
View File

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

4
examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
View File

@ -36,13 +36,13 @@
#include "contiki-lib.h"
#include "contiki-net.h"
#include "rpl.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include <string.h>
#include <stdio.h>
/*---------------------------------------------------------------------------*/
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
/*---------------------------------------------------------------------------*/
#ifndef CETIC_6LBR_NODE_INFO_PORT
#define CETIC_6LBR_NODE_INFO_PORT 3000

2
examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
View File

@ -41,7 +41,7 @@
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "mqtt.h"
#include "rpl.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-icmp6.h"
#include "sys/etimer.h"
#include "sys/ctimer.h"

8
examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
View File

@ -60,9 +60,9 @@
#include "sys/process.h"
#include "dev/serial-line.h"
#include "dev/cc26xx-uart.h"
#include "net/ip/uip.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ip/uiplib.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-udp-packet.h"
#include "net/ipv6/uiplib.h"
#include "net-uart.h"
#include "httpd-simple.h"
#include "sys/cc.h"
@ -75,7 +75,7 @@
#include <stdlib.h>
/*---------------------------------------------------------------------------*/
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
/*---------------------------------------------------------------------------*/
#define REMOTE_PORT 7777
#define MAX_MSG_SIZE 100

2
examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h
View File

@ -30,7 +30,7 @@
#ifndef NET_UART_H_
#define NET_UART_H_
/*---------------------------------------------------------------------------*/
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include <stdint.h>
/*---------------------------------------------------------------------------*/

2
examples/platform-specific/jn516x/rpl/border-router/border-router.c
View File

@ -33,7 +33,7 @@
#include "tools/rpl-tools.h"
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
static uip_ipaddr_t prefix;
static uint8_t prefix_set;

4
examples/platform-specific/jn516x/rpl/border-router/slip-bridge.c
View File

@ -38,7 +38,7 @@
* Nicolas Tsiftes <nvt@sics.se>
*/
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "dev/slip.h"
#if CONTIKI_TARGET_JN516X
@ -51,7 +51,7 @@
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#ifndef BAUD2UBR
#define BAUD2UBR(X) (X)

2
examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c
View File

@ -32,7 +32,7 @@
*
*/
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "tools/rpl-tools.h"
#include "rest-engine.h"

2
examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c
View File

@ -33,7 +33,7 @@
*/
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "tools/rpl-tools.h"
#include "rest-engine.h"

2
examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c
View File

@ -32,7 +32,7 @@
*
*/
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "tools/rpl-tools.h"
#include "rest-engine.h"

2
examples/platform-specific/jn516x/rpl/node/node.c
View File

@ -41,7 +41,7 @@
#include "tools/rpl-tools.h"
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define CONFIG_VIA_BUTTON PLATFORM_HAS_BUTTON
#if CONFIG_VIA_BUTTON

4
examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
View File

@ -35,14 +35,14 @@
#include "contiki.h"
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include <string.h>
#include <stdio.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
/*---------------------------------------------------------------------------*/
void

8
examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
View File

@ -42,20 +42,20 @@
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/mac/tsch/tsch-schedule.h"
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#include "lib/random.h"
#include "rpl-tools.h"
#include "node-id.h"
#include "waveform.h"
#include "leds.h"
#include "net/ip/uiplib.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ipv6/uiplib.h"
#include "net/ipv6/uip-udp-packet.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])

4
examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c
View File

@ -38,7 +38,7 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#include "simple-udp.h"
@ -54,7 +54,7 @@
#include <ctype.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
static uip_ipaddr_t prefix;
static uint8_t prefix_set;

4
examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c
View File

@ -38,7 +38,7 @@
* Nicolas Tsiftes <nvt@sics.se>
*/
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "dev/slip.h"
#if CONTIKI_TARGET_JN516X
@ -51,7 +51,7 @@
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#ifndef BAUD2UBR
#define BAUD2UBR(X) (X)

4
examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
View File

@ -35,7 +35,7 @@
#include "contiki.h"
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "orchestra.h"
@ -43,7 +43,7 @@
#include <stdio.h>
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
void
print_network_status(void)

2
examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c
View File

@ -34,7 +34,7 @@
#include "contiki.h"
#include "net/ipv6/uip-ds6.h"
#include "net/netstack.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/linkaddr.h"
#include "rpl-tools.h"
#include "rest-engine.h"

4
examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c
View File

@ -34,7 +34,7 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#include "simple-udp.h"
@ -51,7 +51,7 @@
#include <ctype.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
static uip_ipaddr_t prefix;
static uint8_t prefix_set;

4
examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c
View File

@ -38,7 +38,7 @@
* Nicolas Tsiftes <nvt@sics.se>
*/
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "dev/slip.h"
#if CONTIKI_TARGET_JN516X
@ -51,7 +51,7 @@
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#ifndef BAUD2UBR
#define BAUD2UBR(X) (X)

2
examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c
View File

@ -33,7 +33,7 @@
*/
#include "contiki.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/linkaddr.h"
#include "rpl-tools.h"
#include "rest-engine.h"

2
examples/platform-specific/nrf52dk/coap-demo/coap-server.c
View File

@ -57,7 +57,7 @@
#include "dev/leds.h"
#define DEBUG DEBUG_PRINT
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
/*
* Resources to be activated need to be imported through the extern keyword.

2
examples/platform-specific/nrf52dk/coap-demo/resources/res-leds.c
View File

@ -44,7 +44,7 @@
#include "dev/leds.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
static void
res_post_put_handler(void *request, void *response, uint8_t *buffer,

2
examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c
View File

@ -44,7 +44,7 @@
/*---------------------------------------------------------------------------*/
#include "contiki.h"
#include "mqtt.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/sicslowpan.h"
#include "sys/etimer.h"

2
examples/platform-specific/zoul/orion/client/client.c
View File

@ -31,7 +31,7 @@
/*---------------------------------------------------------------------------*/
#include "contiki-net.h"
#include "http-socket.h"
#include "ip64-addr.h"
#include "ipv6/ip64-addr.h"
#include "dev/leds.h"
#include "rpl.h"
#include <stdio.h>

2
examples/platform-specific/zoul/orion/client/ifttt-client.c
View File

@ -31,7 +31,7 @@
/*---------------------------------------------------------------------------*/
#include "contiki-net.h"
#include "http-socket.h"
#include "ip64-addr.h"
#include "ipv6/ip64-addr.h"
#include "dev/leds.h"
#include "rpl.h"
#include "dev/button-sensor.h"

4
examples/platform-specific/zoul/orion/ip64-router/ip64-router.c
View File

@ -43,12 +43,12 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "dev/leds.h"
#include "ip64.h"
#include "ip64/ip64.h"
#include "net/netstack.h"
#include "httpd-simple.h"

2
examples/trickle-library/trickle-library.c
View File

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

20
os/contiki-net.h
View File

@ -36,24 +36,24 @@
#include "contiki.h"
#include "net/ip/tcpip.h"
#include "net/ip/uip.h"
#include "net/ip/uiplib.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ip/simple-udp.h"
#include "net/ip/uip-nameserver.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uiplib.h"
#include "net/ipv6/uip-udp-packet.h"
#include "net/ipv6/simple-udp.h"
#include "net/ipv6/uip-nameserver.h"
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/uip-ds6.h"
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/ip/resolv.h"
#include "net/ipv6/resolv.h"
#include "net/ip/psock.h"
#include "net/ipv6/psock.h"
#include "net/ip/udp-socket.h"
#include "net/ip/tcp-socket.h"
#include "net/ipv6/udp-socket.h"
#include "net/ipv6/tcp-socket.h"
#include "net/netstack.h"

2
os/dev/slip.c
View File

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

2
os/net/app-layer/http-socket/http-socket.c
View File

@ -29,7 +29,7 @@
*
*/
#include "contiki-net.h"
#include "ip64-addr.h"
#include "ipv6/ip64-addr.h"
#include "http-socket.h"
#include <ctype.h>

6
os/net/app-layer/http-socket/websocket-http-client.c
View File

@ -30,10 +30,10 @@
*/
#include "websocket-http-client.h"
#include "net/ip/uiplib.h"
#include "net/ip/resolv.h"
#include "net/ipv6/uiplib.h"
#include "net/ipv6/resolv.h"
#include "ip64-addr.h"
#include "ipv6/ip64-addr.h"
#include <stdio.h>
#include <string.h>

2
os/net/app-layer/mqtt/mqtt.c
View File

@ -48,7 +48,7 @@
#include "sys/ctimer.h"
#include "sys/etimer.h"
#include "sys/pt.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "dev/leds.h"

2
os/net/app-layer/mqtt/mqtt.h
View File

@ -89,7 +89,7 @@
#include "lib/random.h"
#include "sys/ctimer.h"
#include "sys/etimer.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "dev/leds.h"

2
os/net/ip/ip64-addr.c → os/net/ipv6/ip64-addr.c
View File

@ -29,7 +29,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "ip64-addr.h"
#include "ipv6/ip64-addr.h"
#include <stdio.h>
#include <string.h>

2
os/net/ip/ip64-addr.h → os/net/ipv6/ip64-addr.h
View File

@ -32,7 +32,7 @@
#ifndef IP64_ADDR_H
#define IP64_ADDR_H
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
/**

4
os/net/ipv6/multicast/esmrf.c
View File

@ -52,7 +52,7 @@
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/netstack.h"
#include "net/packetbuf.h"
#include <string.h>
@ -60,7 +60,7 @@
extern uint16_t uip_slen;
#define DEBUG NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define ESMRF_VERBOSE NONE

2
os/net/ipv6/multicast/roll-tm.c
View File

@ -50,7 +50,7 @@
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
#define TRICKLE_VERBOSE 0

2
os/net/ipv6/multicast/smrf.c
View File

@ -57,7 +57,7 @@
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "net/ipv6/uip-debug.h"
/*---------------------------------------------------------------------------*/
/* Macros */

2
os/net/ipv6/multicast/uip-mcast6-route.c
View File

@ -43,7 +43,7 @@
#include "contiki.h"
#include "lib/list.h"
#include "lib/memb.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include <stdint.h>

2
os/net/ipv6/multicast/uip-mcast6-route.h
View File

@ -43,7 +43,7 @@
#define UIP_MCAST6_ROUTE_H_
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip.h"
#include <stdint.h>
/*---------------------------------------------------------------------------*/

2
os/net/ip/psock.c → os/net/ipv6/psock.c
View File

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

0
os/net/ip/psock.h → os/net/ipv6/psock.h
View File

8
os/net/ip/resolv.c → os/net/ipv6/resolv.c
View File

@ -62,10 +62,10 @@
* function with the hostname.
*/
#include "net/ip/tcpip.h"
#include "net/ip/resolv.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ip/uip-nameserver.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/resolv.h"
#include "net/ipv6/uip-udp-packet.h"
#include "net/ipv6/uip-nameserver.h"
#include "lib/random.h"
#ifndef DEBUG

0
os/net/ip/resolv.h → os/net/ipv6/resolv.h
View File

4
os/net/ipv6/sicslowpan.c
View File

@ -63,8 +63,8 @@
#include "contiki.h"
#include "dev/watchdog.h"
#include "net/link-stats.h"
#include "net/ip/tcpip.h"
#include "net/ip/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/sicslowpan.h"
#include "net/netstack.h"

2
os/net/ipv6/sicslowpan.h
View File

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

2
os/net/ip/simple-udp.c → os/net/ipv6/simple-udp.c
View File

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

2
os/net/ip/simple-udp.h → os/net/ipv6/simple-udp.h
View File

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

2
os/net/ip/tcp-socket.c → os/net/ipv6/tcp-socket.c
View File

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

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