riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4713 from authmillenon/pkg/port/emb6

Browse Source 
pkg: initial import of emb6 stack
This commit is contained in:
Martine Lenders 2016-04-01 00:35:54 +02:00
commit 8ab89c473a
26 changed files with 4077 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile.dep
View File

@ -357,6 +357,29 @@ ifneq (,$(filter posix_semaphore,$(USEMODULE)))
USEMODULE += xtimer
endif
ifneq (,$(filter emb6_conn_udp,$(USEMODULE)))
USEMODULE += emb6_sock
endif
ifneq (,$(filter emb6_%,$(USEMODULE)))
USEMODULE += emb6
endif
ifneq (,$(filter emb6,$(USEMODULE)))
USEPKG += emb6
USEMODULE += emb6_bsp
USEMODULE += emb6_common
USEMODULE += emb6_contrib
USEMODULE += emb6_ipv6
USEMODULE += emb6_ipv6_multicast
USEMODULE += emb6_llsec
USEMODULE += emb6_mac
USEMODULE += emb6_netdev2
USEMODULE += emb6_rpl
USEMODULE += emb6_sicslowpan
USEMODULE += emb6_utils
endif
ifneq (,$(filter lwip_sixlowpan,$(USEMODULE)))
USEMODULE += lwip_ipv6_autoconfig
endif
@ -411,6 +434,25 @@ ifneq (,$(filter lwip_contrib,$(USEMODULE)))
USEMODULE += sema
endif
ifneq (,$(filter emb6_%,$(USEMODULE)))
USEMODULE += emb6
endif
ifneq (,$(filter emb6,$(USEMODULE)))
USEPKG += emb6
USEMODULE += emb6_bsp
USEMODULE += emb6_common
USEMODULE += emb6_contrib
USEMODULE += emb6_ipv6
USEMODULE += emb6_ipv6_multicast
USEMODULE += emb6_llsec
USEMODULE += emb6_mac
USEMODULE += emb6_netdev2
USEMODULE += emb6_rpl
USEMODULE += emb6_sicslowpan
USEMODULE += emb6_utils
endif
ifneq (,$(filter sema,$(USEMODULE)))
USEMODULE += xtimer
endif

1
Makefile.pseudomodules
View File

@ -4,6 +4,7 @@ PSEUDOMODULES += conn_tcp
PSEUDOMODULES += conn_udp
PSEUDOMODULES += core_msg
PSEUDOMODULES += core_thread_flags
PSEUDOMODULES += emb6_router
PSEUDOMODULES += gnrc_netdev_default
PSEUDOMODULES += gnrc_ipv6_default
PSEUDOMODULES += gnrc_ipv6_router

11
pkg/emb6/Makefile Normal file
View File

@ -0,0 +1,11 @@
PKG_NAME=emb6
PKG_URL=https://github.com/hso-esk/emb6.git
PKG_VERSION=14e4a3cfff01644e078870e14e16a1fe60dcc895
PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
.PHONY: all
all: git-download
"$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk

71
pkg/emb6/Makefile.include Normal file
View File

@ -0,0 +1,71 @@
PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/emb6
EMB6_DIR := $(PKG_BUILDDIR)
EMB6_CONTRIB := $(RIOTBASE)/pkg/emb6/contrib
INCLUDES += -I$(PKG_BUILDDIR)/target
INCLUDES += -I$(RIOTBASE)/pkg/emb6/include
ifeq (,$(filter emb6_router,$(USEMODULE)))
CFLAGS += -DEMB6_CONF_ROUTER=FALSE
endif
ifneq (,$(filter emb6_bsp,$(USEMODULE)))
DIRS += $(EMB6_DIR)/target/bsp
endif
ifneq (,$(filter emb6_common,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6
INCLUDES += -I$(EMB6_DIR)/emb6
endif
ifneq (,$(filter emb6_contrib,$(USEMODULE)))
DIRS += $(EMB6_CONTRIB)
endif
ifneq (,$(filter emb6_conn_udp,$(USEMODULE)))
DIRS += $(EMB6_CONTRIB)/conn/udp
endif
ifneq (,$(filter emb6_ipv6,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6/src/net/ipv6
INCLUDES += -I$(EMB6_DIR)/emb6/inc/net/ipv6
endif
ifneq (,$(filter emb6_ipv6_multicast,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6/src/net/ipv6/multicast
INCLUDES += -I$(EMB6_DIR)/emb6/inc/net/ipv6/multicast
endif
ifneq (,$(filter emb6_llsec,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6/src/mac/llsec
INCLUDES += -I$(EMB6_DIR)/emb6/inc/mac/llsec
endif
ifneq (,$(filter emb6_mac,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6/src/mac
INCLUDES += -I$(EMB6_DIR)/emb6/inc/mac
endif
ifneq (,$(filter emb6_netdev2,$(USEMODULE)))
DIRS += $(EMB6_CONTRIB)/netdev2
endif
ifneq (,$(filter emb6_rpl,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6/src/net/rpl
INCLUDES += -I$(EMB6_DIR)/emb6/inc/net/rpl
endif
ifneq (,$(filter emb6_sicslowpan,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6/src/net/sicslowpan
INCLUDES += -I$(EMB6_DIR)/emb6/inc/net/sicslowpan
endif
ifneq (,$(filter emb6_sock,$(USEMODULE)))
DIRS += $(EMB6_DIR)/emb6/src/tport
INCLUDES += -I$(EMB6_DIR)/emb6/inc/tport
endif
ifneq (,$(filter emb6_utils,$(USEMODULE)))
DIRS += $(EMB6_DIR)/utils/src
INCLUDES += -I$(EMB6_DIR)/utils/inc
endif

3
pkg/emb6/contrib/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE = emb6_contrib
include $(RIOTBASE)/Makefile.base

37
pkg/emb6/contrib/board_conf.c Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (C) Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @{
*
* @file
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#include "emb6/netdev2.h"
#include "etimer.h"
#include "board_conf.h"
#define ENABLE_DEBUG (0)
#include "debug.h"
uint8_t board_conf(s_ns_t *ps_nStack)
{
if (ps_nStack != NULL) {
ps_nStack->inif = &emb6_netdev2_driver;
etimer_init();
return ps_nStack->inif->init(ps_nStack);
}
else {
DEBUG("Network stack pointer is NULL");
return 0;
}
}
/** @} */

3
pkg/emb6/contrib/conn/udp/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE = emb6_conn_udp
include $(RIOTBASE)/Makefile.base

244
pkg/emb6/contrib/conn/udp/emb6_conn_udp.c Normal file
View File

@ -0,0 +1,244 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @{
*
* @file
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#include <assert.h>
#include <errno.h>
#include <stdbool.h>
#include "evproc.h"
#include "msg.h"
#include "mutex.h"
#include "net/af.h"
#include "net/conn/udp.h"
#include "net/ipv6/hdr.h"
#include "sched.h"
#include "uip.h"
#define _MSG_TYPE_CLOSE (0x4123)
#define _MSG_TYPE_RCV (0x4124)
/* struct to describe a sendto command for emb6 thread */
typedef struct {
struct udp_socket sock;
mutex_t mutex;
const void *data;
int res;
uint16_t data_len;
} _send_cmd_t;
extern uint16_t uip_slen;
static bool send_registered = false;
static void _input_callback(struct udp_socket *c, void *ptr,
const uip_ipaddr_t *src_addr, uint16_t src_port,
const uip_ipaddr_t *dst_addr, uint16_t dst_port,
const uint8_t *data, uint16_t datalen);
static void _output_callback(c_event_t c_event, p_data_t p_data);
static int _reg_and_bind(struct udp_socket *c, void *ptr,
udp_socket_input_callback_t cb, uint16_t port)
{
if (udp_socket_register(c, ptr, cb) < 0) {
return -EMFILE;
}
if (udp_socket_bind(c, port) < 0) {
udp_socket_close(c);
return -EALREADY;
}
return 0;
}
int conn_udp_create(conn_udp_t *conn, const void *addr, size_t addr_len,
int family, uint16_t port)
{
int res;
(void)addr;
(void)addr_len;
if (family != AF_INET6) {
return -EAFNOSUPPORT;
}
if (conn->sock.input_callback != NULL) {
return -EINVAL;
}
mutex_init(&conn->mutex);
mutex_lock(&conn->mutex);
if ((res = _reg_and_bind(&conn->sock, conn, _input_callback, port)) < 0) {
conn->sock.input_callback = NULL;
mutex_unlock(&conn->mutex);
return res;
}
conn->waiting_thread = KERNEL_PID_UNDEF;
mutex_unlock(&conn->mutex);
return 0;
}
void conn_udp_close(conn_udp_t *conn)
{
if (conn->sock.input_callback != NULL) {
mutex_lock(&conn->mutex);
if (conn->waiting_thread != KERNEL_PID_UNDEF) {
msg_t msg;
msg.type = _MSG_TYPE_CLOSE;
msg.content.ptr = (char *)conn;
mutex_unlock(&conn->mutex);
msg_send(&msg, conn->waiting_thread);
mutex_lock(&conn->mutex);
}
udp_socket_close(&conn->sock);
conn->sock.input_callback = NULL;
mutex_unlock(&conn->mutex);
}
}
int conn_udp_getlocaladdr(conn_udp_t *conn, void *addr, uint16_t *port)
{
if (conn->sock.input_callback != NULL) {
mutex_lock(&conn->mutex);
memset(addr, 0, sizeof(ipv6_addr_t));
*port = NTOHS(conn->sock.udp_conn->lport);
mutex_unlock(&conn->mutex);
return sizeof(ipv6_addr_t);
}
return -EBADF;
}
int conn_udp_recvfrom(conn_udp_t *conn, void *data, size_t max_len, void *addr,
size_t *addr_len, uint16_t *port)
{
int res = -EIO;
msg_t msg;
if (conn->sock.input_callback == NULL) {
return -ENOTSOCK;
}
mutex_lock(&conn->mutex);
if (conn->waiting_thread != KERNEL_PID_UNDEF) {
mutex_unlock(&conn->mutex);
return -EALREADY;
}
conn->waiting_thread = sched_active_pid;
mutex_unlock(&conn->mutex);
msg_receive(&msg);
if (msg.type == _MSG_TYPE_CLOSE) {
conn->waiting_thread = KERNEL_PID_UNDEF;
return -EINTR;
}
else if (msg.type == _MSG_TYPE_RCV) {
mutex_lock(&conn->mutex);
if (msg.content.ptr == (char *)conn) {
if (max_len < conn->recv_info.datalen) {
conn->waiting_thread = KERNEL_PID_UNDEF;
mutex_unlock(&conn->mutex);
return -ENOBUFS;
}
memcpy(data, conn->recv_info.data, conn->recv_info.datalen);
memcpy(addr, conn->recv_info.src, sizeof(ipv6_addr_t));
*addr_len = sizeof(ipv6_addr_t);
*port = conn->recv_info.src_port;
res = (int)conn->recv_info.datalen;
}
conn->waiting_thread = KERNEL_PID_UNDEF;
mutex_unlock(&conn->mutex);
}
return res;
}
int conn_udp_sendto(const void *data, size_t len, const void *src, size_t src_len,
const void *dst, size_t dst_len, int family, uint16_t sport,
uint16_t dport)
{
int res;
_send_cmd_t send_cmd;
if (!send_registered) {
if (evproc_regCallback(EVENT_TYPE_CONN_SEND, _output_callback) != E_SUCCESS) {
return -EIO;
}
else {
send_registered = true;
}
}
mutex_init(&send_cmd.mutex);
if ((len > (UIP_BUFSIZE - (UIP_LLH_LEN + UIP_IPUDPH_LEN))) ||
(len > UINT16_MAX)) {
return -EMSGSIZE;
}
if ((dst_len > sizeof(ipv6_addr_t)) || (family != AF_INET6)) {
return -EAFNOSUPPORT;
}
mutex_lock(&send_cmd.mutex);
send_cmd.data = data;
send_cmd.data_len = (uint16_t)len;
if ((res = _reg_and_bind(&send_cmd.sock, NULL, NULL, sport)) < 0) {
mutex_unlock(&send_cmd.mutex);
return res;
}
udp_socket_connect(&send_cmd.sock, (uip_ipaddr_t *)dst, dport); /* can't fail at this point */
/* change to emb6 thread context */
if (evproc_putEvent(E_EVPROC_TAIL, EVENT_TYPE_CONN_SEND, &send_cmd) != E_SUCCESS) {
udp_socket_close(&send_cmd.sock);
mutex_unlock(&send_cmd.mutex);
return -EIO;
}
/* block thread until data was send */
mutex_lock(&send_cmd.mutex);
udp_socket_close(&send_cmd.sock);
mutex_unlock(&send_cmd.mutex);
return send_cmd.res;
}
static void _input_callback(struct udp_socket *c, void *ptr,
const uip_ipaddr_t *src_addr, uint16_t src_port,
const uip_ipaddr_t *dst_addr, uint16_t dst_port,
const uint8_t *data, uint16_t datalen)
{
conn_udp_t *conn = ptr;
(void)dst_addr;
(void)dst_port;
mutex_lock(&conn->mutex);
if (conn->waiting_thread != KERNEL_PID_UNDEF) {
msg_t msg;
conn->recv_info.src_port = src_port;
conn->recv_info.src = (const ipv6_addr_t *)src_addr;
conn->recv_info.data = data;
conn->recv_info.datalen = datalen - sizeof(ipv6_hdr_t);
msg.type = _MSG_TYPE_RCV;
msg.content.ptr = (char *)conn;
mutex_unlock(&conn->mutex);
msg_send(&msg, conn->waiting_thread);
}
else {
mutex_unlock(&conn->mutex);
}
}
static void _output_callback(c_event_t c_event, p_data_t p_data)
{
_send_cmd_t *send_cmd = (_send_cmd_t *)p_data;
if ((c_event != EVENT_TYPE_CONN_SEND) || (p_data == NULL)) {
return;
}
if ((send_cmd->res = udp_socket_send(&send_cmd->sock, send_cmd->data, send_cmd->data_len)) < 0) {
send_cmd->res = -EHOSTUNREACH;
}
mutex_unlock(&send_cmd->mutex);
}
/** @} */

3
pkg/emb6/contrib/netdev2/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE = emb6_netdev2
include $(RIOTBASE)/Makefile.base

207
pkg/emb6/contrib/netdev2/emb6_netdev2.c Normal file
View File

@ -0,0 +1,207 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @{
*
* @file
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#include <assert.h>
#include <stdint.h>
#include <sys/uio.h>
#include "msg.h"
#include "net/netdev2.h"
#include "evproc.h"
#include "emb6.h"
#include "linkaddr.h"
#include "packetbuf.h"
#define ENABLE_DEBUG (0)
#include "debug.h"
extern uip_lladdr_t uip_lladdr;
static netdev2_t *_dev = NULL;
static s_nsLowMac_t *_lowmac = NULL;
static int8_t _rssi_base_value = -100;
static uint8_t _last_rssi;
static int8_t _netdev2_init(s_ns_t *p_ns);
static int8_t _netdev2_send(const void *pr_payload, uint8_t c_len);
static int8_t _netdev2_on(void);
static int8_t _netdev2_off(void);
static void _netdev2_set_txpower(int8_t power);
static int8_t _netdev2_get_txpower(void);
static void _netdev2_set_sensitivity(int8_t sens);
static int8_t _netdev2_get_sensitivity(void);
static int8_t _netdev2_get_rssi(void);
static void _netdev2_set_promisc(uint8_t c_on_off);
const s_nsIf_t emb6_netdev2_driver = {
.name = "netdev2",
.init = &_netdev2_init,
.send = &_netdev2_send,
.on = &_netdev2_on,
.off = &_netdev2_off,
.set_txpower = &_netdev2_set_txpower,
.get_txpower = &_netdev2_get_txpower,
.set_sensitivity = &_netdev2_set_sensitivity,
.get_sensitivity = &_netdev2_get_sensitivity,
.get_rssi = &_netdev2_get_rssi,
.ant_div = NULL,
.ant_rf_switch = NULL,
.set_promisc = &_netdev2_set_promisc,
};
static void _get_recv_pkt(void)
{
char *dataptr;
struct netdev2_radio_rx_info rx_info;
int8_t len;
packetbuf_clear();
dataptr = packetbuf_dataptr();
len = _dev->driver->recv(_dev, dataptr, PACKETBUF_SIZE, &rx_info);
_last_rssi = rx_info.rssi;
if ((len > 0) && (_lowmac != NULL)) {
packetbuf_set_datalen(len);
_lowmac->input();
}
}
static void _event_cb(netdev2_t *dev, netdev2_event_t event, void *arg)
{
(void)arg;
if (event == NETDEV2_EVENT_ISR) {
/* EVENT_TYPE_PCK_LL is supposed to be used by drivers, so use it
* (though NETDEV2_EVENT_ISR technically doesn't only signify
* incoming packets) */
evproc_putEvent(E_EVPROC_HEAD, EVENT_TYPE_PCK_LL, NULL);
}
else {
switch (event) {
case NETDEV2_EVENT_RX_COMPLETE: {
_get_recv_pkt();
}
break;
default:
break;
}
}
}
static void _emb6_netdev2_callback(c_event_t c_event, p_data_t p_data)
{
(void)p_data;
if (c_event == EVENT_TYPE_PCK_LL) {
_dev->driver->isr(_dev);
}
}
int emb6_netdev2_setup(netdev2_t *dev)
{
if (_dev == NULL) {
_dev = dev;
return 0;
}
return -1;
}
static int8_t _netdev2_init(s_ns_t *p_ns)
{
if ((_dev != NULL) && (p_ns != NULL) && (p_ns->lmac != NULL)) {
_dev->event_callback = _event_cb;
_dev->driver->get(_dev, NETOPT_ADDRESS_LONG, &mac_phy_config.mac_address,
sizeof(mac_phy_config.mac_address));
memcpy(&uip_lladdr, mac_phy_config.mac_address,
sizeof(mac_phy_config.mac_address));
_dev->driver->get(_dev, NETOPT_NID, &mac_phy_config.pan_id,
sizeof(mac_phy_config.pan_id));
linkaddr_set_node_addr((linkaddr_t *)&uip_lladdr);
_lowmac = p_ns->lmac;
evproc_regCallback(EVENT_TYPE_PCK_LL, _emb6_netdev2_callback);
return 1;
}
return 0;
}
static int8_t _netdev2_send(const void *pr_payload, uint8_t c_len)
{
if (_dev != NULL) {
const struct iovec vector = {
.iov_base = (void *)pr_payload,
.iov_len = c_len
};
if (_dev->driver->send(_dev, &vector, 1) < 0) {
DEBUG("Error on send\n");
return RADIO_TX_ERR;
}
DEBUG("Packet of length %u was transmitted\n", (unsigned)c_len);
return RADIO_TX_OK;
}
DEBUG("Device was not initialized\n");
return RADIO_TX_ERR;
}
static int8_t _netdev2_on(void)
{
/* TODO: turn netdev2 on */
return 1;
}
static int8_t _netdev2_off(void)
{
/* TODO: turn netdev2 off */
return 1;
}
static void _netdev2_set_txpower(int8_t power)
{
int16_t pwr = power;
_dev->driver->set(_dev, NETOPT_TX_POWER, &pwr, sizeof(pwr));
}
static int8_t _netdev2_get_txpower(void)
{
int16_t power = 0;
_dev->driver->get(_dev, NETOPT_TX_POWER, &power, sizeof(power));
return (int8_t)power;
}
static void _netdev2_set_sensitivity(int8_t sens)
{
/* TODO: set sensitivity */
}
static int8_t _netdev2_get_sensitivity(void)
{
/* TODO: get sensitivity */
return 0;
}
static int8_t _netdev2_get_rssi(void)
{
return (int8_t)(_rssi_base_value + 1.03 * _last_rssi);
}
static void _netdev2_set_promisc(uint8_t c_on_off)
{
netopt_enable_t en = (c_on_off) ? NETOPT_ENABLE : NETOPT_DISABLE;
_dev->driver->set(_dev, NETOPT_PROMISCUOUSMODE, &en, sizeof(en));
}
/** @} */

213
pkg/emb6/contrib/target.c Normal file
View File

@ -0,0 +1,213 @@
/*
* Copyright (C) Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @{
*
* @file
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#include <inttypes.h>
#include "cpu.h"
#include "led.h"
#include "mutex.h"
#include "periph/gpio.h"
#include "periph/hwrng.h"
#include "xtimer.h"
#include "target.h"
#include "bsp.h"
static mutex_t critical_mutex = MUTEX_INIT;
void hal_enterCritical(void)
{
mutex_lock(&critical_mutex);
}
void hal_exitCritical(void)
{
mutex_unlock(&critical_mutex);
}
int8_t hal_init(void)
{
/* Should have happened long before emb6 started, so nothing to do */
return 1;
}
uint8_t hal_getrand(void)
{
#if RANDOM_NUMOF
uint8_t res;
hwnrg_read((char *)&res, sizeof(res));
return res;
#elif defined(MODULE_RANDOM)
return (uint8_t)(genrand_uint32() % UINT8_MAX);
#else
return 4; /* keeping the meme alive ;-) */
#endif
}
void hal_ledOn(uint16_t ui_led)
{
switch (ui_led) {
case E_BSP_LED_RED:
LED0_ON;
break;
case E_BSP_LED_YELLOW:
LED1_ON;
break;
case E_BSP_LED_GREEN:
LED2_ON;
break;
default:
break;
}
}
void hal_ledOff(uint16_t ui_led)
{
switch (ui_led) {
case E_BSP_LED_RED:
LED0_OFF;
break;
case E_BSP_LED_YELLOW:
LED1_OFF;
break;
case E_BSP_LED_GREEN:
LED2_OFF;
break;
default:
break;
}
}
uint8_t hal_extIntInit(en_targetExtInt_t e_extInt, pfn_intCallb_t pfn_intCallback)
{
/* RIOT does this in netdev2 initialization so nothing to do here. */
return 0;
}
void hal_delay_us(uint32_t i_delay)
{
xtimer_usleep(i_delay);
}
uint8_t hal_gpioPinInit(uint8_t c_pin, uint8_t c_dir, uint8_t c_initState)
{
/* Only used in board init code => not needed */
(void)c_pin;
(void)c_dir;
(void)c_initState;
return 0;
}
void *hal_ctrlPinInit(en_targetExtPin_t e_pinType)
{
(void)e_pinType;
return NULL;
}
void hal_pinSet(void *p_pin)
{
/* Only used in board/driver-related code code => not needed */
}
void hal_pinClr(void *p_pin)
{
/* Only used in board/driver-related code code => not needed */
}
uint8_t hal_pinGet(void *p_pin)
{
/* Only used in board/driver-related code code => not needed */
return 0;
}
void *hal_spiInit(void)
{
/* Only used in board/driver-related code code => not needed */
return 0;
}
/*----------------------------------------------------------------------------*/
/** \brief This function selects slave with which we will work
* \param p_spi Pointer to spi description entity
* \param action true or false
*
* \return 0 if failed, 1 id ok
*/
/*---------------------------------------------------------------------------*/
uint8_t hal_spiSlaveSel(void *p_spi, bool action)
{
/* Only used in board/driver-related code code => not needed */
return 0;
}
uint8_t hal_spiTransceive( uint8_t *txData, uint8_t *p_reg)
{
/* Only used in board/driver-related code code => not needed */
return 0;
}
uint8_t hal_spiRead(uint8_t *p_reg, uint16_t i_length)
{
/* Only used in board/driver-related code code => not needed */
return 0;
}
/*----------------------------------------------------------------------------*/
/** \brief This function writes a new value via given SPI interface
* registers.
*
*
* \param value Pointer to a value.
* \param i_length Length of a data to be received
*/
/*----------------------------------------------------------------------------*/
void hal_spiWrite(uint8_t *value, uint16_t i_length)
{
/* Only used in board/driver-related code code => not needed */
}
void hal_watchdogReset(void)
{
/* WDT and tick-less scheduling don't make much sense */
}
void hal_watchdogStart(void)
{
/* WDT and tick-less scheduling don't make much sense */
}
void hal_watchdogStop(void)
{
/* WDT and tick-less scheduling don't make much sense */
}
clock_time_t hal_getTick(void)
{
return (clock_time_t)xtimer_now();
}
clock_time_t hal_getSec(void)
{
return (clock_time_t)xtimer_now() / SEC_IN_USEC;
}
clock_time_t hal_getTRes(void)
{
return SEC_IN_USEC;
}
/** @} */

9
pkg/emb6/doc.txt Normal file
View File

@ -0,0 +1,9 @@
/**
* @defgroup pkg_emb6 emb6 network stack
* @ingroup pkg
* @brief emb6 network stack
* @see https://github.com/hso-esk/emb6/raw/develop/doc/pdf/emb6.pdf
*
* emb6 is a fork of Contiki's uIP network stack without its usage of
* proto-threads. It uses periodic event polling instead.
*/

46
pkg/emb6/include/board_conf.h Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @defgroup emb6 emb6 network stack
* @ingroup pkg
* @brief
* @{
*
* @file
* @brief "Board" configuration for emb6
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#ifndef EMB6_BOARD_CONF_H_
#define EMB6_BOARD_CONF_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "emb6.h"
/**
* @brief emb6 board configuration function
*
* @param[in] ps_nStack pointer to global netstack struct
*
* @return success 1
* @return failure 0
*/
uint8_t board_conf(s_ns_t *ps_nStack);
#ifdef __cplusplus
}
#endif
#endif /* EMB6_BOARD_CONF_H_ */
/** @} */
/** @} */

62
pkg/emb6/include/emb6/conn/udp.h Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @defgroup emb6_conn_udp udp_conn wrapper for emb6
* @ingroup emb6
* @brief UDP conn for emb6
*
* For this implementation to receive with an open connection only with one
* thread at once. If you use @ref conn_udp_recvfrom() with more than one thread
* simultaneously, it will return `-EALREADY`.
*
* @{
*
* @file
* @brief UDP conn definitions
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#ifndef EMB6_CONN_UDP_H_
#define EMB6_CONN_UDP_H_
#include <stdint.h>
#include "kernel_types.h"
#include "mutex.h"
#include "net/ipv6/addr.h"
#include "uip.h"
#include "udp-socket.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief @ref net_conn_udp definition for emb6
*/
struct conn_udp {
struct udp_socket sock; /**< emb6 internal socket */
mutex_t mutex; /**< mutex for the connection */
kernel_pid_t waiting_thread; /**< thread waiting for an incoming packet
* on this connection */
struct {
uint16_t src_port; /**< source port */
const ipv6_addr_t *src; /**< source address */
const void *data; /**< data of received packet */
size_t datalen; /**< length of received packet data */
} recv_info; /**< info on received packet */
};
#ifdef __cplusplus
}
#endif
#endif /* EMB6_CONN_UDP_H_ */
/** @} */

56
pkg/emb6/include/emb6/netdev2.h Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @defgroup pkgemb6_netdev2 netdev2 wrapper for emb6
* @ingroup pkg_emb6
* @brief
* @{
*
* @file
* @brief
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#ifndef EMB6_NETDEV2_H_
#define EMB6_NETDEV2_H_
#include "net/netdev2.h"
#include "emb6.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief The emb6 network interface.
*
* @note emb6 only supports one network interface.
*
* This variable is used by @ref board_conf() to set the interface for the
* stack.
*/
extern const s_nsIf_t emb6_netdev2_driver;
/**
* @brief Setup a network device as the emb6 interface.
*
* @param[in] dev The network device for the interface
*
* @return 0 on success.
* @return <= 0 on error.
*/
int emb6_netdev2_setup(netdev2_t *dev);
#ifdef __cplusplus
}
#endif
#endif /* EMB6_NETDEV2_H_ */
/** @} */

130
pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch Normal file
View File

@ -0,0 +1,130 @@
From 4b417436908a6823e631519f794a20644a467f19 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Mon, 11 Jan 2016 15:09:34 +0100
Subject: [PATCH 1/4] Add RIOT Makefiles
---
Makefile | 1 +
emb6/Makefile | 3 +++
emb6/src/mac/Makefile | 3 +++
emb6/src/mac/llsec/Makefile | 3 +++
emb6/src/net/ipv6/Makefile | 3 +++
emb6/src/net/ipv6/multicast/Makefile | 3 +++
emb6/src/net/rpl/Makefile | 3 +++
emb6/src/net/sicslowpan/Makefile | 3 +++
emb6/src/tport/Makefile | 3 +++
target/bsp/Makefile | 3 +++
utils/src/Makefile | 3 +++
11 files changed, 31 insertions(+)
create mode 100644 Makefile
create mode 100644 emb6/Makefile
create mode 100644 emb6/src/mac/Makefile
create mode 100644 emb6/src/mac/llsec/Makefile
create mode 100644 emb6/src/net/ipv6/Makefile
create mode 100644 emb6/src/net/ipv6/multicast/Makefile
create mode 100644 emb6/src/net/rpl/Makefile
create mode 100644 emb6/src/net/sicslowpan/Makefile
create mode 100644 emb6/src/tport/Makefile
create mode 100644 target/bsp/Makefile
create mode 100644 utils/src/Makefile
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..48422e9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/Makefile b/emb6/Makefile
new file mode 100644
index 0000000..c2ec39f
--- /dev/null
+++ b/emb6/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_common
+
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/mac/Makefile b/emb6/src/mac/Makefile
new file mode 100644
index 0000000..d0472d8
--- /dev/null
+++ b/emb6/src/mac/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_mac
+
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/mac/llsec/Makefile b/emb6/src/mac/llsec/Makefile
new file mode 100644
index 0000000..e13ee7f
--- /dev/null
+++ b/emb6/src/mac/llsec/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_llsec
+
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/ipv6/Makefile b/emb6/src/net/ipv6/Makefile
new file mode 100644
index 0000000..844e39c
--- /dev/null
+++ b/emb6/src/net/ipv6/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_ipv6
+
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/ipv6/multicast/Makefile b/emb6/src/net/ipv6/multicast/Makefile
new file mode 100644
index 0000000..f1c3f1e
--- /dev/null
+++ b/emb6/src/net/ipv6/multicast/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_ipv6_multicast
+
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/rpl/Makefile b/emb6/src/net/rpl/Makefile
new file mode 100644
index 0000000..2fd941c
--- /dev/null
+++ b/emb6/src/net/rpl/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_rpl
+
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/sicslowpan/Makefile b/emb6/src/net/sicslowpan/Makefile
new file mode 100644
index 0000000..9e14df3
--- /dev/null
+++ b/emb6/src/net/sicslowpan/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_sicslowpan
+
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/tport/Makefile b/emb6/src/tport/Makefile
new file mode 100644
index 0000000..1b0ca7c
--- /dev/null
+++ b/emb6/src/tport/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_sock
+
+include $(RIOTBASE)/Makefile.base
diff --git a/target/bsp/Makefile b/target/bsp/Makefile
new file mode 100644
index 0000000..ce548bd
--- /dev/null
+++ b/target/bsp/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_bsp
+
+include $(RIOTBASE)/Makefile.base
diff --git a/utils/src/Makefile b/utils/src/Makefile
new file mode 100644
index 0000000..c9aa897
--- /dev/null
+++ b/utils/src/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_utils
+
+include $(RIOTBASE)/Makefile.base
--
1.9.1

1553
pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch Normal file
View File

File diff suppressed because it is too large Load Diff

757
pkg/emb6/patches/0003-Fix-warnings.patch Normal file
View File

@ -0,0 +1,757 @@
From cb47e0b69b747833322a83b7396878a631add116 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Fri, 5 Feb 2016 00:46:31 +0100
Subject: [PATCH 3/4] Fix warnings
---
emb6/src/net/ipv6/multicast/roll-tm.c | 82 ++++++++++++++++++------
emb6/src/net/ipv6/multicast/smrf.c | 12 +++-
emb6/src/net/ipv6/multicast/uip-mcast6-route.c | 2 +-
emb6/src/net/ipv6/tcpip.c | 25 ++++++--
emb6/src/net/ipv6/uip-icmp6.c | 35 +++++++++--
emb6/src/net/ipv6/uip-nd6.c | 74 ++++++++++++++++++----
emb6/src/net/ipv6/uip6.c | 86 +++++++++++++++++++++-----
emb6/src/net/rpl/rpl-ext-header.c | 50 ++++++++++++---
emb6/src/net/rpl/rpl-icmp6.c | 24 +++++--
emb6/src/net/sicslowpan/sicslowpan.c | 45 +++++++++++---
emb6/src/tport/udp-socket.c | 7 ++-
11 files changed, 365 insertions(+), 77 deletions(-)
diff --git a/emb6/src/net/ipv6/multicast/roll-tm.c b/emb6/src/net/ipv6/multicast/roll-tm.c
index 8b36300..96f4f47 100644
--- a/emb6/src/net/ipv6/multicast/roll-tm.c
+++ b/emb6/src/net/ipv6/multicast/roll-tm.c
@@ -290,12 +290,17 @@ struct mcast_packet {
#define MCAST_PACKET_S_BIT 0x20 /* Must Send Next Pass */
#define MCAST_PACKET_L_BIT 0x10 /* Is listed in ICMP message */
+static inline struct uip_ip_hdr *_to_ip_hdr(void *ptr)
+{
+ return (struct uip_ip_hdr *)ptr;
+}
+
/* Fetch a pointer to the Seed ID of a buffered message p */
#if ROLL_TM_SHORT_SEEDS
#define MCAST_PACKET_GET_SEED(p) ((seed_id_t *)&((p)->seed_id))
#else
#define MCAST_PACKET_GET_SEED(p) \
- ((seed_id_t *)&((struct uip_ip_hdr *)&(p)->buff[UIP_LLH_LEN])->srcipaddr)
+ ((seed_id_t *)&(((struct uip_ip_hdr *)&(p))->buff[UIP_LLH_LEN])->srcipaddr)
#endif
/**
@@ -303,7 +308,7 @@ struct mcast_packet {
* p: pointer to a packet buffer
*/
#define MCAST_PACKET_TTL(p) \
- (((struct uip_ip_hdr *)(p)->buff)->ttl)
+ (_to_ip_hdr((p)->buff)->ttl)
/**
* \brief Set 'Is Used' bit for packet p
@@ -462,14 +467,55 @@ static uint16_t last_seq;
/*---------------------------------------------------------------------------*/
/* uIPv6 Pointers */
/*---------------------------------------------------------------------------*/
-#define UIP_DATA_BUF ((uint8_t *)&uip_buf[uip_l2_l3_hdr_len + UIP_UDPH_LEN])
-#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
-#define UIP_EXT_BUF_NEXT ((uint8_t *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN + HBHO_TOTAL_LEN])
-#define UIP_EXT_OPT_FIRST ((struct hbho_mcast *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN + 2])
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_ICMP_PAYLOAD ((unsigned char *)&uip_buf[uip_l2_l3_icmp_hdr_len])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline uint8_t *uip_data_buf(void)
+{
+ return ((uint8_t *)&uip_buf[uip_l2_l3_hdr_len + UIP_UDPH_LEN]);
+}
+
+static inline struct uip_udp_hdr *uip_udp_buf(void)
+{
+ return ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_ext_hdr *uip_ext_buf(void)
+{
+ return ((struct uip_ext_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN]);
+}
+
+uint8_t *uip_ext_buf_next(void)
+{
+ return ((uint8_t *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN + HBHO_TOTAL_LEN]);
+}
+
+static inline struct hbho_mcast *uip_ext_opt_first(void)
+{
+ return ((struct hbho_mcast *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN + 2]);
+}
+
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+static inline struct uip_icmp_hdr *uip_icmp_buf(void)
+{
+ return ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline unsigned char *uip_icmp_payload(void)
+{
+ return ((unsigned char *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
+#define UIP_DATA_BUF (uip_data_buf())
+#define UIP_UDP_BUF (uip_udp_buf())
+#define UIP_EXT_BUF (uip_ext_buf())
+#define UIP_EXT_BUF_NEXT (uip_ext_buf_next())
+#define UIP_EXT_OPT_FIRST (uip_ext_opt_first())
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_ICMP_BUF (uip_icmp_buf())
+#define UIP_ICMP_PAYLOAD (uip_icmp_payload())
extern uint16_t uip_slen;
/*---------------------------------------------------------------------------*/
/* Local function prototypes */
@@ -689,7 +735,7 @@ reset_trickle_timer(uint8_t index)
}
/*---------------------------------------------------------------------------*/
static struct sliding_window *
-window_allocate()
+window_allocate(void)
{
for(iterswptr = &windows[ROLL_TM_WINS - 1]; iterswptr >= windows;
iterswptr--) {
@@ -721,7 +767,7 @@ window_lookup(seed_id_t *s, uint8_t m)
}
/*---------------------------------------------------------------------------*/
static void
-window_update_bounds()
+window_update_bounds(void)
{
for(iterswptr = &windows[ROLL_TM_WINS - 1]; iterswptr >= windows;
iterswptr--) {
@@ -748,7 +794,7 @@ window_update_bounds()
}
/*---------------------------------------------------------------------------*/
static struct mcast_packet *
-buffer_reclaim()
+buffer_reclaim(void)
{
struct sliding_window *largest = windows;
struct mcast_packet *rv;
@@ -790,7 +836,7 @@ buffer_reclaim()
}
/*---------------------------------------------------------------------------*/
static struct mcast_packet *
-buffer_allocate()
+buffer_allocate(void)
{
for(locmpptr = &buffered_msgs[ROLL_TM_BUFF_NUM - 1];
locmpptr >= buffered_msgs; locmpptr--) {
@@ -802,7 +848,7 @@ buffer_allocate()
}
/*---------------------------------------------------------------------------*/
static void
-icmp_output()
+icmp_output(void)
{
struct sequence_list_header *sl;
uint8_t *buffer;
@@ -1098,7 +1144,7 @@ accept(uint8_t in)
/*---------------------------------------------------------------------------*/
/* ROLL TM ICMPv6 Input Handler */
static void
-icmp_input()
+icmp_input(void)
{
uint8_t inconsistency;
uint16_t *seq_ptr;
@@ -1321,7 +1367,7 @@ drop:
}
/*---------------------------------------------------------------------------*/
static void
-out()
+out(void)
{
if(uip_len + HBHO_TOTAL_LEN > UIP_BUFSIZE) {
@@ -1391,7 +1437,7 @@ drop:
}
/*---------------------------------------------------------------------------*/
static uint8_t
-in()
+in(void)
{
/*
* We call accept() which will sort out caching and forwarding. Depending
diff --git a/emb6/src/net/ipv6/multicast/smrf.c b/emb6/src/net/ipv6/multicast/smrf.c
index 9b4a3a5..38d31cd 100644
--- a/emb6/src/net/ipv6/multicast/smrf.c
+++ b/emb6/src/net/ipv6/multicast/smrf.c
@@ -77,7 +77,13 @@ static uint8_t fwd_spread;
/*---------------------------------------------------------------------------*/
/* uIPv6 Pointers */
/*---------------------------------------------------------------------------*/
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+#define UIP_IP_BUF (uip_ip_buf())
/*---------------------------------------------------------------------------*/
static void
mcast_fwd(void *p)
@@ -90,7 +96,7 @@ mcast_fwd(void *p)
}
/*---------------------------------------------------------------------------*/
static uint8_t
-in()
+in(void)
{
rpl_dag_t *d; /* Our DODAG */
uip_ipaddr_t *parent_ipaddr; /* Our pref. parent's IPv6 address */
@@ -201,7 +207,7 @@ init(void)
}
/*---------------------------------------------------------------------------*/
static void
-out()
+out(void)
{
return;
}
diff --git a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
index 55d245d..75443a5 100644
--- a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
+++ b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
@@ -126,7 +126,7 @@ uip_mcast6_route_count(void)
}
/*---------------------------------------------------------------------------*/
void
-uip_mcast6_route_init()
+uip_mcast6_route_init(void)
{
memb_init(&mcast_route_memb);
list_init(mcast_route_list);
diff --git a/emb6/src/net/ipv6/tcpip.c b/emb6/src/net/ipv6/tcpip.c
index 9c76bed..1901d9e 100644
--- a/emb6/src/net/ipv6/tcpip.c
+++ b/emb6/src/net/ipv6/tcpip.c
@@ -72,9 +72,24 @@ void uip_log(char *msg);
#define UIP_LOG(m)
#endif
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[UIP_LLIPH_LEN + uip_ext_len])
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_TCP_BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
+static inline struct uip_icmp_hdr *uip_icmp_buf(void)
+{
+ return ((struct uip_icmp_hdr *)&uip_buf[UIP_LLIPH_LEN + uip_ext_len]);
+}
+
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+static inline struct uip_tcpip_hdr *uip_tcp_buf(void)
+{
+ return ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+#define UIP_ICMP_BUF (uip_icmp_buf())
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_TCP_BUF (uip_tcp_buf())
#ifdef UIP_FALLBACK_INTERFACE
extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE;
@@ -165,15 +180,15 @@ unsigned char tcpip_is_forwarding; /* Forwarding right now? */
//PROCESS(tcpip_process, "TCP/IP stack");
/*---------------------------------------------------------------------------*/
+#if UIP_TCP
static void
start_periodic_tcp_timer(void)
{
-#if UIP_TCP
if(etimer_expired(&periodic)) {
etimer_restart(&periodic);
}
-#endif /* UIP_TCP */
}
+#endif /* UIP_TCP */
/*---------------------------------------------------------------------------*/
static void
check_for_tcp_syn(void)
diff --git a/emb6/src/net/ipv6/uip-icmp6.c b/emb6/src/net/ipv6/uip-icmp6.c
index 484d0bf..6f53d12 100644
--- a/emb6/src/net/ipv6/uip-icmp6.c
+++ b/emb6/src/net/ipv6/uip-icmp6.c
@@ -59,11 +59,34 @@
#define PRINT6ADDR(addr)
#endif
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_ICMP6_ERROR_BUF ((struct uip_icmp6_error *)&uip_buf[uip_l2_l3_icmp_hdr_len])
-#define UIP_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_FIRST_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[UIP_LLIPH_LEN])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+static inline struct uip_icmp_hdr *uip_icmp_buf(void)
+{
+ return ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_icmp6_error *uip_icmp6_error_buf(void) {
+ return ((struct uip_icmp6_error *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
+static inline struct uip_ext_hdr *uip_ext_buf(void) {
+ return ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_ext_hdr *uip_first_ext_buf(void) {
+ return ((struct uip_ext_hdr *)&uip_buf[UIP_LLIPH_LEN]);
+}
+
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_ICMP_BUF (uip_icmp_buf())
+#define UIP_ICMP6_ERROR_BUF (uip_icmp6_error_buf())
+#define UIP_EXT_BUF (uip_ext_buf())
+#define UIP_FIRST_EXT_BUF (uip_first_ext_buf())
/** \brief temporary IP address */
static uip_ipaddr_t tmp_ipaddr;
@@ -409,7 +432,7 @@ UIP_ICMP6_HANDLER(echo_reply_handler, ICMP6_ECHO_REPLY,
UIP_ICMP6_HANDLER_CODE_ANY, echo_reply_input);
/*---------------------------------------------------------------------------*/
void
-uip_icmp6_init()
+uip_icmp6_init(void)
{
/* Register Echo Request and Reply handlers */
uip_icmp6_register_input_handler(&echo_request_handler);
diff --git a/emb6/src/net/ipv6/uip-nd6.c b/emb6/src/net/ipv6/uip-nd6.c
index f04b6b3..26ed214 100644
--- a/emb6/src/net/ipv6/uip-nd6.c
+++ b/emb6/src/net/ipv6/uip-nd6.c
@@ -93,6 +93,37 @@ void uip_log(char *msg);
#define UIP_LOG(m)
#endif /* UIP_LOGGING == 1 */
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) /**< Pointer to IP header */;
+}
+
+static inline struct uip_icmp_hdr *uip_icmp_buf(void)
+{
+ return ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) /**< Pointer to ICMP header*/;
+}
+
+static inline uip_nd6_rs *uip_nd6_rs_buf(void)
+{
+ return ((uip_nd6_rs *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
+static inline uip_nd6_ra *uip_nd6_ra_buf(void)
+{
+ return ((uip_nd6_ra *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
+static inline uip_nd6_ns *uip_nd6_ns_buf(void)
+{
+ return ((uip_nd6_ns *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
+static inline uip_nd6_na *uip_nd6_na_buf(void)
+{
+ return ((uip_nd6_na *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
/*------------------------------------------------------------------*/
/** @{ */
/** \name Pointers to the header structures.
@@ -106,19 +137,19 @@ void uip_log(char *msg);
* value of these length variables
*/
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) /**< Pointer to IP header */
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) /**< Pointer to ICMP header*/
+#define UIP_IP_BUF (uip_ip_buf()) /**< Pointer to IP header */
+#define UIP_ICMP_BUF (uip_icmp_buf()) /**< Pointer to ICMP header*/
/**@{ Pointers to messages just after icmp header */
-#define UIP_ND6_RS_BUF ((uip_nd6_rs *)&uip_buf[uip_l2_l3_icmp_hdr_len])
-#define UIP_ND6_RA_BUF ((uip_nd6_ra *)&uip_buf[uip_l2_l3_icmp_hdr_len])
-#define UIP_ND6_NS_BUF ((uip_nd6_ns *)&uip_buf[uip_l2_l3_icmp_hdr_len])
-#define UIP_ND6_NA_BUF ((uip_nd6_na *)&uip_buf[uip_l2_l3_icmp_hdr_len])
+#define UIP_ND6_RS_BUF (uip_nd6_rs_buf())
+#define UIP_ND6_RA_BUF (uip_nd6_ra_buf())
+#define UIP_ND6_NS_BUF (uip_nd6_ns_buf())
+#define UIP_ND6_NA_BUF (uip_nd6_na_buf())
/** @} */
/** Pointer to ND option */
-#define UIP_ND6_OPT_HDR_BUF ((uip_nd6_opt_hdr *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset])
-#define UIP_ND6_OPT_PREFIX_BUF ((uip_nd6_opt_prefix_info *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset])
-#define UIP_ND6_OPT_MTU_BUF ((uip_nd6_opt_mtu *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset])
-#define UIP_ND6_OPT_RDNSS_BUF ((uip_nd6_opt_dns *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset])
+#define UIP_ND6_OPT_HDR_BUF (uip_nd6_opt_hdr_buf())
+#define UIP_ND6_OPT_PREFIX_BUF (uip_nd6_opt_prefix_buf())
+#define UIP_ND6_OPT_MTU_BUF (uip_nd6_opt_mtu_buf())
+#define UIP_ND6_OPT_RDNSS_BUF (uip_nd6_opt_rdnss_buf())
/** @} */
static uint8_t nd6_opt_offset; /** Offset from the end of the icmpv6 header to the option in uip_buf*/
@@ -132,6 +163,27 @@ static uip_ds6_prefix_t *prefix; /** Pointer to a prefix list entry */
static uip_ds6_nbr_t *nbr; /** Pointer to a nbr cache entry*/
static uip_ds6_defrt_t *defrt; /** Pointer to a router list entry */
static uip_ds6_addr_t *addr; /** Pointer to an interface address */
+
+static inline uip_nd6_opt_hdr *uip_nd6_opt_hdr_buf(void)
+{
+ return ((uip_nd6_opt_hdr *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset]);
+}
+
+static inline uip_nd6_opt_prefix_info *uip_nd6_opt_prefix_buf(void)
+{
+ return ((uip_nd6_opt_prefix_info *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset]);
+}
+
+static inline uip_nd6_opt_mtu *uip_nd6_opt_mtu_buf(void)
+{
+ return ((uip_nd6_opt_mtu *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset]);
+}
+
+static inline uip_nd6_opt_dns *uip_nd6_opt_rdnss_buf(void)
+{
+ return ((uip_nd6_opt_dns *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset]);
+}
+
/*------------------------------------------------------------------*/
/* create a llao */
static void
@@ -1054,7 +1106,7 @@ UIP_ICMP6_HANDLER(ra_input_handler, ICMP6_RA, UIP_ICMP6_HANDLER_CODE_ANY,
#endif
/*---------------------------------------------------------------------------*/
void
-uip_nd6_init()
+uip_nd6_init(void)
{
#if UIP_ND6_SEND_NA
diff --git a/emb6/src/net/ipv6/uip6.c b/emb6/src/net/ipv6/uip6.c
index 89edb73..281c8d9 100644
--- a/emb6/src/net/ipv6/uip6.c
+++ b/emb6/src/net/ipv6/uip6.c
@@ -152,6 +152,61 @@ uint8_t uip_ext_len = 0;
uint8_t uip_ext_opt_offset = 0;
/** @} */
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void) {
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+static inline struct uip_icmp_hdr *uip_icmp_buf(void) {
+ return ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_udp_hdr *uip_udp_buf(void) {
+ return ((struct uip_udp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN]);
+}
+
+static inline struct uip_tcp_hdr *uip_tcp_buf(void) {
+ return ((struct uip_tcp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN]);
+}
+
+static inline struct uip_ext_hdr *uip_ext_buf(void) {
+ return ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_routing_hdr *uip_routing_buf(void) {
+ return ((struct uip_routing_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_frag_hdr *uip_frag_buf(void) {
+ return ((struct uip_frag_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_hbho_hdr *uip_hbho_buf(void) {
+ return ((struct uip_hbho_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_desto_hdr *uip_desto_buf(void) {
+ return ((struct uip_desto_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_ext_hdr_opt *uip_ext_hdr_opt_buf(void) {
+ return ((struct uip_ext_hdr_opt *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]);
+}
+
+static inline struct uip_ext_hdr_opt_padn *uip_ext_hdr_opt_padn_buf(void) {
+ return ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]);
+}
+
+#if UIP_CONF_IPV6_RPL
+static inline struct uip_ext_hdr_opt_rpl *uip_ext_hdr_opt_rpl_buf(void) {
+ return ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]);
+}
+#endif /* UIP_CONF_IPV6_RPL */
+
+static inline struct uip_icmp6_error *uip_icmp6_error_buf(void) {
+ return ((struct uip_icmp6_error *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
/*---------------------------------------------------------------------------*/
/* Buffers */
/*---------------------------------------------------------------------------*/
@@ -159,22 +214,22 @@ uint8_t uip_ext_opt_offset = 0;
* \name Buffer defines
* @{
*/
-#define FBUF ((struct uip_tcpip_hdr *)&uip_reassbuf[0])
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
-#define UIP_TCP_BUF ((struct uip_tcp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
-#define UIP_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_ROUTING_BUF ((struct uip_routing_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_FRAG_BUF ((struct uip_frag_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_HBHO_BUF ((struct uip_hbho_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_DESTO_BUF ((struct uip_desto_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_EXT_HDR_OPT_BUF ((struct uip_ext_hdr_opt *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
-#define UIP_EXT_HDR_OPT_PADN_BUF ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
+#define FBUF (fbuf())
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_ICMP_BUF (uip_icmp_buf())
+#define UIP_UDP_BUF (uip_udp_buf())
+#define UIP_TCP_BUF (uip_tcp_buf())
+#define UIP_EXT_BUF (uip_ext_buf())
+#define UIP_ROUTING_BUF (uip_routing_buf())
+#define UIP_FRAG_BUF (uip_frag_buf())
+#define UIP_HBHO_BUF (uip_hbho_buf())
+#define UIP_DESTO_BUF (uip_desto_buf())
+#define UIP_EXT_HDR_OPT_BUF (uip_ext_hdr_opt_buf())
+#define UIP_EXT_HDR_OPT_PADN_BUF (uip_ext_hdr_opt_padn_buf())
#if UIP_CONF_IPV6_RPL
-#define UIP_EXT_HDR_OPT_RPL_BUF ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
+#define UIP_EXT_HDR_OPT_RPL_BUF (uip_ext_hdr_opt_rpl_buf())
#endif /* UIP_CONF_IPV6_RPL */
-#define UIP_ICMP6_ERROR_BUF ((struct uip_icmp6_error *)&uip_buf[uip_l2_l3_icmp_hdr_len])
+#define UIP_ICMP6_ERROR_BUF (uip_icmp6_error_buf())
/** @} */
/**
* \name Buffer variables
@@ -647,6 +702,9 @@ static uint8_t uip_reassflags;
#define UIP_REASS_FLAG_FIRSTFRAG 0x02
#define UIP_REASS_FLAG_ERROR_MSG 0x04
+static inline struct uip_tcpip_hdr *fbuf(void) {
+ return ((struct uip_tcpip_hdr *)&uip_reassbuf[0]);
+}
/*
* See RFC 2460 for a description of fragmentation in IPv6
diff --git a/emb6/src/net/rpl/rpl-ext-header.c b/emb6/src/net/rpl/rpl-ext-header.c
index 8bf1fe1..a680d52 100644
--- a/emb6/src/net/rpl/rpl-ext-header.c
+++ b/emb6/src/net/rpl/rpl-ext-header.c
@@ -56,13 +56,49 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_HBHO_BUF ((struct uip_hbho_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_HBHO_NEXT_BUF ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len + RPL_HOP_BY_HOP_LEN])
-#define UIP_EXT_HDR_OPT_BUF ((struct uip_ext_hdr_opt *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
-#define UIP_EXT_HDR_OPT_PADN_BUF ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
-#define UIP_EXT_HDR_OPT_RPL_BUF ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+static inline struct uip_ext_hdr *uip_ext_buf(void)
+{
+ return ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_hbho_hdr *uip_hbho_buf(void)
+{
+ return ((struct uip_hbho_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline struct uip_ext_hdr *uip_hbho_next_buf(void)
+{
+ return ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len + RPL_HOP_BY_HOP_LEN]);
+}
+
+static inline struct uip_ext_hdr_opt *uip_ext_hdr_opt_buf(int uip_ext_opt_offset)
+{
+ return ((struct uip_ext_hdr_opt *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]);
+}
+
+static inline struct uip_ext_hdr_opt_padn *uip_ext_hdr_opt_padn_buf(int uip_ext_opt_offset)
+{
+ return ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]);
+}
+
+static inline struct uip_ext_hdr_opt_rpl *uip_ext_hdr_opt_rpl_buf(int uip_ext_opt_offset)
+{
+ return ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]);
+}
+
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_EXT_BUF (uip_ext_buf())
+#define UIP_HBHO_BUF (uip_hbho_buf())
+#define UIP_HBHO_NEXT_BUF (uip_hbho_next_buf())
+#define UIP_EXT_HDR_OPT_BUF (uip_ext_hdr_opt_buf(uip_ext_opt_offset))
+#define UIP_EXT_HDR_OPT_PADN_BUF (uip_ext_hdr_opt_padn_buf(uip_ext_opt_offset))
+#define UIP_EXT_HDR_OPT_RPL_BUF (uip_ext_hdr_opt_rpl_buf(uip_ext_opt_offset))
/*---------------------------------------------------------------------------*/
int
rpl_verify_header(int uip_ext_opt_offset)
diff --git a/emb6/src/net/rpl/rpl-icmp6.c b/emb6/src/net/rpl/rpl-icmp6.c
index 0675e63..84eb5bd 100644
--- a/emb6/src/net/rpl/rpl-icmp6.c
+++ b/emb6/src/net/rpl/rpl-icmp6.c
@@ -68,9 +68,25 @@
#define RPL_DIO_MOP_MASK 0x38
#define RPL_DIO_PREFERENCE_MASK 0x07
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_ICMP_PAYLOAD ((unsigned char *)&uip_buf[uip_l2_l3_icmp_hdr_len])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+static inline struct uip_icmp_hdr *uip_icmp_buf(void)
+{
+ return ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len]);
+}
+
+static inline unsigned char *uip_icmp_payload(void)
+{
+ return ((unsigned char *)&uip_buf[uip_l2_l3_icmp_hdr_len]);
+}
+
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_ICMP_BUF (uip_icmp_buf())
+#define UIP_ICMP_PAYLOAD (uip_icmp_payload())
/*---------------------------------------------------------------------------*/
static void dis_input(void);
static void dio_input(void);
@@ -950,7 +966,7 @@ dao_ack_output(rpl_instance_t *instance, uip_ipaddr_t *dest, uint8_t sequence)
}
/*---------------------------------------------------------------------------*/
void
-rpl_icmp6_register_handlers()
+rpl_icmp6_register_handlers(void)
{
uip_icmp6_register_input_handler(&dis_handler);
uip_icmp6_register_input_handler(&dio_handler);
diff --git a/emb6/src/net/sicslowpan/sicslowpan.c b/emb6/src/net/sicslowpan/sicslowpan.c
index 79afefe..529c6f4 100644
--- a/emb6/src/net/sicslowpan/sicslowpan.c
+++ b/emb6/src/net/sicslowpan/sicslowpan.c
@@ -161,13 +161,34 @@ void uip_log(char *msg);
/** \name Pointers in the sicslowpan and uip buffer
* @{
*/
-#define SICSLOWPAN_IP_BUF ((struct uip_ip_hdr *)&sicslowpan_buf[UIP_LLH_LEN])
-#define SICSLOWPAN_UDP_BUF ((struct uip_udp_hdr *)&sicslowpan_buf[UIP_LLIPH_LEN])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+struct uip_ip_hdr *uip_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+struct uip_udp_hdr *uip_udp_buf(void)
+{
+ return ((struct uip_udp_hdr *)&uip_buf[UIP_LLIPH_LEN]);
+}
+
+struct uip_tcp_hdr *uip_tcp_buf(void)
+{
+ return ((struct uip_tcp_hdr *)&uip_buf[UIP_LLIPH_LEN]);
+}
+
+struct uip_icmp_hdr *uip_icmp_buf(void)
+{
+ return ((struct uip_icmp_hdr *)&uip_buf[UIP_LLIPH_LEN]);
+}
+
+#define SICSLOWPAN_IP_BUF (sicslowpan_ip_buf())
+#define SICSLOWPAN_UDP_BUF (sicslowpan_udp_buf())
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLIPH_LEN])
-#define UIP_TCP_BUF ((struct uip_tcp_hdr *)&uip_buf[UIP_LLIPH_LEN])
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[UIP_LLIPH_LEN])
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_UDP_BUF (uip_udp_buf())
+#define UIP_TCP_BUF (uip_tcp_buf())
+#define UIP_ICMP_BUF (uip_icmp_buf())
/** @} */
@@ -282,6 +303,16 @@ static s_ns_t* p_ns = NULL;
/*-------------------------------------------------------------------------*/
static struct rime_sniffer *callback = NULL;
+struct uip_ip_hdr *sicslowpan_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&sicslowpan_buf[UIP_LLH_LEN]);
+}
+
+struct uip_udp_hdr *sicslowpan_udp_buf(void)
+{
+ return ((struct uip_udp_hdr *)&sicslowpan_buf[UIP_LLIPH_LEN]);
+}
+
void
rime_sniffer_add(struct rime_sniffer *s)
{
@@ -295,7 +326,7 @@ rime_sniffer_remove(struct rime_sniffer *s)
}
static void
-set_packet_attrs()
+set_packet_attrs(void)
{
int c = 0;
/* set protocol in NETWORK_ID */
diff --git a/emb6/src/tport/udp-socket.c b/emb6/src/tport/udp-socket.c
index 545f6bd..3980716 100644
--- a/emb6/src/tport/udp-socket.c
+++ b/emb6/src/tport/udp-socket.c
@@ -44,7 +44,12 @@ void _udp_sock_callback(c_event_t c_event, p_data_t p_data);
static uint8_t buf[UIP_BUFSIZE];
-#define UIP_IP_BUF ((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_udpip_hdr *uip_ip_buf(void) {
+ return ((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN]);
+}
+
+#define UIP_IP_BUF (uip_ip_buf())
#define LOGGER_ENABLE LOGGER_CORE
#if LOGGER_ENABLE == TRUE
--
1.9.1

38
pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-conn_.-_send.patch Normal file
View File

@ -0,0 +1,38 @@
From 6b0721c0d546652238c139f0d41790cb77996442 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Fri, 26 Feb 2016 12:35:52 +0100
Subject: [PATCH 4/4] Provide event type for RIOT's conn_.*_send
---
utils/inc/evproc.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/utils/inc/evproc.h b/utils/inc/evproc.h
index 5316a67..78153be 100644
--- a/utils/inc/evproc.h
+++ b/utils/inc/evproc.h
@@ -79,6 +79,7 @@
EVENT_TYPE_ICMP6, \
EVENT_TYPE_TCPIP, \
EVENT_TYPE_SLIP_POLL, \
+ EVENT_TYPE_CONN_SEND, \
EVENT_TYPE_PCK_LL }
#define EVENT_TYPE_NONE 0x00 ///< No event
@@ -89,11 +90,12 @@
#define EVENT_TYPE_ICMP6 0x05 ///< New icmp6 packet event
#define EVENT_TYPE_TCPIP 0x06 ///< New tcpip event
#define EVENT_TYPE_SLIP_POLL 0x07 ///< Process slip handler
+#define EVENT_TYPE_CONN_SEND 0x08 ///< Send command from conn layer
#define OBLIG_EVENT_PRIOR 0x0a
#define EVENT_TYPE_PCK_LL 0x0a ///< New low level packet received
-#define EVENT_TYPES_COUNT 8 ///< Counter of events in /ref EVENT_TYPES macro
+#define EVENT_TYPES_COUNT 9 ///< Counter of events in /ref EVENT_TYPES macro
#define MAX_CALLBACK_COUNT 7 ///< Maximal amount of callbacks in /ref st_funcRegList_t list
#define EVPROC_QUEUE_SIZE 20 ///< Maximal amount of events in /ref pst_evList queue
/*=============================================================================
--
1.9.1

4
sys/include/net/conn/udp.h
View File

@ -31,6 +31,10 @@
#include "lwip/conn.h"
#endif
#ifdef MODULE_EMB6_CONN_UDP
#include "emb6/conn/udp.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif

38
tests/emb6/Makefile Normal file
View File

@ -0,0 +1,38 @@
APPLICATION = emb6
FEATURES_REQUIRED = periph_gpio periph_spi # for at86rf231
BOARD ?= samr21-xpro
RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := msb-430h stm32f0discovery weio z1
USEMODULE += emb6_router
USEMODULE += emb6_conn_udp
USEMODULE += ipv6_addr
USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += ps
USEMODULE += od
# define the driver to be used for selected boards
ifneq (,$(filter samr21-xpro,$(BOARD)))
DRIVER := at86rf233
endif
ifneq (,$(filter iotlab-m3 fox,$(BOARD)))
DRIVER := at86rf231
endif
ifneq (,$(filter mulle,$(BOARD)))
DRIVER := at86rf212b
endif
# use the at86rf231 as fallback device
DRIVER ?= at86rf231
# include the selected driver
USEMODULE += $(DRIVER)
QUIET ?= 1
include $(RIOTBASE)/Makefile.include

57
tests/emb6/common.c Normal file
View File

@ -0,0 +1,57 @@
/*
* Copyright (C) Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @{
*
* @file
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#include <stdbool.h>
#include "common.h"
size_t hex2ints(uint8_t *out, const char *in)
{
bool upper = true;
size_t out_size = 0;
while (*in != '\0') {
char c;
if ((*in >= '0') && (*in <= '9')) {
c = '0';
}
else if ((*in >= 'a') && (*in <= 'f')) {
c = 'a' - 10;
}
else if ((*in >= 'A') && (*in <= 'F')) {
c = 'A' - 10;
}
else {
in++;
continue;
}
if (upper) {
*out = (char)(*in - c) << 4;
}
else {
*out |= (char)(*in - c);
out++;
out_size++;
}
upper = !upper;
in++;
}
if (!upper) {
out_size++;
}
return out_size;
}
/** @} */

79
tests/emb6/common.h Normal file
View File

@ -0,0 +1,79 @@
/*
* Copyright (C) 2016 Martine Lenders <mlenders@inf.fu-berlin.de>
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup tests
* @{
*
* @file
* @brief Definitions for tests/lwip/
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/
#ifndef MAIN_H_
#define MAIN_H_
#include <stdint.h>
#include <sys/types.h>
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Application configuration
* @{
*/
#define CONN_INBUF_SIZE (256)
#define SERVER_MSG_QUEUE_SIZE (8)
#define SERVER_BUFFER_SIZE (64)
/**
* @}
*/
/**
* @brief Converts hex string to byte array.
*
* @param[out] out Resulting byte array
* @param[in] in `\0` terminated string. Non-hex characters (all except 0-9, a-f, A-F)
* will be ignored.
*
* @return Length of @p out.
*/
size_t hex2ints(uint8_t *out, const char *in);
/**
* @brief Ping shell command
*
* @param[in] argc number of arguments
* @param[in] argv array of arguments
*
* @return 0 on success
* @return other on error
*/
int ping_cmd(int argc, char **argv);
#ifdef MODULE_CONN_UDP
/**
* @brief UDP IP shell command
*
* @param[in] argc number of arguments
* @param[in] argv array of arguments
*
* @return 0 on success
* @return other on error
*/
int udp_cmd(int argc, char **argv);
#endif
#ifdef __cplusplus
}
#endif
#endif /* MAIN_H_ */
/** @} */

109
tests/emb6/main.c Normal file
View File

@ -0,0 +1,109 @@
/*
* Copyright (C) 2015 Martine Lenders <mlenders@inf.fu-berlin.de>
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup examples
* @{
*
* @file
* @brief Test for raw IPv6 connections
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*
* This test application tests the gnrc_conn_ip module. If you select protocol 58 you can also
* test if gnrc is able to deal with multiple subscribers to ICMPv6 (gnrc_icmpv6 and this
* application).
*
* @}
*/
#include <errno.h>
#include <stdio.h>
#include "at86rf2xx.h"
#include "at86rf2xx_params.h"
#include "common.h"
#include "emb6.h"
#include "emb6/netdev2.h"
#include "uip-ds6.h"
#include "net/ipv6/addr.h"
#include "shell.h"
#include "thread.h"
#include "xtimer.h"
#define EMB6_STACKSIZE (THREAD_STACKSIZE_DEFAULT)
#define EMB6_PRIO (THREAD_PRIORITY_MAIN - 3)
#define EMB6_DELAY (500)
static at86rf2xx_t at86rf2xx;
static s_ns_t emb6 = {
.hc = &sicslowpan_driver,
.llsec = &nullsec_driver,
.hmac = &nullmac_driver,
.lmac = &sicslowmac_driver,
.frame = &framer_802154,
.c_configured = 1,
};
static char emb6_stack[EMB6_STACKSIZE];
static int ifconfig(int argc, char **argv)
{
(void)argc;
(void)argv;
char addrstr[IPV6_ADDR_MAX_STR_LEN];
printf("0: ");
for (int i = 0; i < UIP_DS6_ADDR_NB; i++) {
if (uip_ds6_if.addr_list[i].isused) {
printf("inet6 %s\n",
ipv6_addr_to_str(addrstr,
(ipv6_addr_t *)&uip_ds6_if.addr_list[i].ipaddr,
sizeof(addrstr)));
if (i != 0) {
printf(" ");
}
}
}
puts("");
return 0;
}
static void *_emb6_thread(void *args)
{
emb6_process(500); /* never stops */
return NULL;
}
static const shell_command_t shell_commands[] = {
{ "ping6", "Send pings and receive pongs", ping_cmd },
#ifdef MODULE_CONN_UDP
{ "udp", "Send UDP messages and listen for messages on UDP port", udp_cmd },
#endif
{ "ifconfig", "Shows assigned IPv6 addresses", ifconfig },
{ NULL, NULL, NULL }
};
static char line_buf[SHELL_DEFAULT_BUFSIZE];
char conn_inbuf[CONN_INBUF_SIZE];
int main(void)
{
netdev2_t *netdev = (netdev2_t *)&at86rf2xx;
puts("RIOT lwip test application");
at86rf2xx_setup(&at86rf2xx, at86rf2xx_params);
netdev->driver->init((netdev2_t *)&at86rf2xx);
emb6_netdev2_setup(netdev);
emb6_init(&emb6);
thread_create(emb6_stack, sizeof(emb6_stack), EMB6_PRIO,
THREAD_CREATE_STACKTEST, _emb6_thread, NULL, "emb6");
shell_run(shell_commands, line_buf, SHELL_DEFAULT_BUFSIZE);
/* should be never reached */
return 0;
}

136
tests/emb6/ping.c Normal file
View File

@ -0,0 +1,136 @@
/*
* Copyright (C) 2015 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup examples
* @{
*
* @file
* @brief Demonstrating the sending and receiving of UDP data over POSIX sockets.
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*
* @}
*/
#include <stdbool.h>
#include <inttypes.h>
#include <stdio.h>
#include "atomic.h"
#include "byteorder.h"
#include "net/icmpv6.h"
#include "net/ipv6.h"
#include "xtimer.h"
#include "uip.h"
#include "uip-icmp6.h"
#include "common.h"
#define ECHO_ID (0xd1e9)
static struct uip_icmp6_echo_reply_notification recv_ntfy = { NULL, NULL };
static uint16_t seq = 0;
static atomic_int_t received, num;
static bool _waiting = true;
static inline icmpv6_echo_t *uip_icmp_buf(void)
{
return ((icmpv6_echo_t *)&uip_buf[uip_l2_l3_hdr_len]);
}
static inline int max_len(void)
{
return UIP_BUFSIZE - (((uint8_t *)uip_icmp_buf()) - uip_buf) -
sizeof(icmpv6_echo_t);
}
static int ping_send(const uip_ipaddr_t *dst, int payload_len)
{
int len = payload_len;
icmpv6_echo_t *ping = uip_icmp_buf();
ping->id = byteorder_htons(ECHO_ID);
if (payload_len > max_len()) {
puts("Payload too long for buffer.");
return -1;
}
for (network_uint16_t *payload = (network_uint16_t *)(ping + 1);
len >= 0;
payload++, len -= 2) {
*payload = byteorder_htons(seq);
}
ping->seq = byteorder_htons(seq++);
uip_icmp6_send((const uip_ipaddr_t *)dst, ICMPV6_ECHO_REQ, 0,
payload_len + (sizeof(icmpv6_echo_t) - sizeof(icmpv6_hdr_t)));
return 0;
}
static void handle_reply(uip_ipaddr_t *source, uint8_t ttl, uint8_t *data,
uint16_t datalen)
{
char addr_str[IPV6_ADDR_MAX_STR_LEN];
icmpv6_echo_t *ping = (icmpv6_echo_t *)data;
_waiting = false;
ipv6_addr_to_str(addr_str, (ipv6_addr_t *)source, sizeof(addr_str));
atomic_inc(&received);
printf("%" PRIu16 " bytes from %s: icmp_seq=%" PRIu16 " ttl=%u quota=%i/%i\n",
datalen, addr_str, byteorder_ntohs(ping->seq), (unsigned)ttl,
ATOMIC_VALUE(received), ATOMIC_VALUE(num));
}
void usage(char *cmd)
{
printf("usage: %s <dst> [<num>] [<payload_len>]\n", cmd);
}
int ping_cmd(int argc, char **argv)
{
ipv6_addr_t dst;
int payload_len, _num;
if ((argc < 2) || (ipv6_addr_from_str(&dst, argv[1]) == NULL)) {
usage(argv[0]);
return 1;
}
if ((argc < 3) || ((_num = atoi(argv[2])) == 0)) {
_num = 3;
}
if ((argc < 4) || ((payload_len = atoi(argv[3])) == 0)) {
payload_len = 16;
}
atomic_set_to_zero(&num);
atomic_cas(&num, 0, _num);
atomic_set_to_zero(&received);
seq = 0;
if (recv_ntfy.callback == NULL) {
uip_icmp6_echo_reply_callback_add(&recv_ntfy, handle_reply);
}
for (uint16_t i = 0; i < _num; i++) {
_waiting = true;
ping_send((uip_ipaddr_t *)&dst, payload_len);
xtimer_usleep(1000000);
if (_waiting) {
puts("Timeout");
}
}
return 0;
}
/** @} */

168
tests/emb6/udp.c Normal file
View File

@ -0,0 +1,168 @@
/*
* Copyright (C) 2015 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup examples
* @{
*
* @file
* @brief Demonstrating the sending and receiving of UDP data over POSIX sockets.
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*
* @}
*/
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include "common.h"
#include "od.h"
#include "net/af.h"
#include "net/conn/udp.h"
#include "net/ipv6.h"
#include "thread.h"
#include "xtimer.h"
#ifdef MODULE_CONN_UDP
static char conn_inbuf[CONN_INBUF_SIZE];
static bool server_running;
static conn_udp_t server_conn;
static char server_stack[THREAD_STACKSIZE_DEFAULT];
static msg_t server_msg_queue[SERVER_MSG_QUEUE_SIZE];
static void *_server_thread(void *args)
{
ipv6_addr_t server_addr = IPV6_ADDR_UNSPECIFIED;
uint16_t port;
int res;
msg_init_queue(server_msg_queue, SERVER_MSG_QUEUE_SIZE);
/* parse port */
port = (uint16_t)atoi((char *)args);
if ((res = conn_udp_create(&server_conn, &server_addr,
sizeof(server_addr), AF_INET6, port)) < 0) {
printf("Unable to open UDP server on port %" PRIu16 " (error code %d)\n",
port, -res);
return NULL;
}
server_running = true;
printf("Success: started UDP server on port %" PRIu16 "\n", port);
while (1) {
int res;
ipv6_addr_t src;
size_t src_len = sizeof(ipv6_addr_t);
uint16_t sport;
if ((res = conn_udp_recvfrom(&server_conn, conn_inbuf, sizeof(conn_inbuf), &src,
&src_len, &sport)) < 0) {
puts("Error on receive");
}
else if (res == 0) {
puts("No data received");
}
else {
char addrstr[IPV6_ADDR_MAX_STR_LEN];
printf("Received from [%s]:%" PRIu16 ":\n", ipv6_addr_to_str(addrstr, &src,
sizeof(addrstr)), sport);
od_hex_dump(conn_inbuf, res, 0);
}
}
return NULL;
}
static int udp_send(char *addr_str, char *port_str, char *data, unsigned int num,
unsigned int delay)
{
ipv6_addr_t src = IPV6_ADDR_UNSPECIFIED, dst;
uint16_t port;
uint8_t byte_data[strlen(data) / 2];
size_t data_len;
/* parse destination address */
if (ipv6_addr_from_str(&dst, addr_str) == NULL) {
puts("Error: unable to parse destination address");
return 1;
}
/* parse port */
port = (uint16_t)atoi(port_str);
data_len = hex2ints(byte_data, data);
for (unsigned int i = 0; i < num; i++) {
if (conn_udp_sendto(byte_data, data_len, &src, sizeof(src), (struct sockaddr *)&dst,
sizeof(dst), AF_INET6, port, port) < 0) {
puts("could not send");
}
else {
printf("Success: send %u byte to [%s]:%" PRIu16 ")\n",
(unsigned)data_len, addr_str, port);
}
xtimer_usleep(delay);
}
return 0;
}
static int udp_start_server(char *port_str)
{
if (thread_create(server_stack, sizeof(server_stack), THREAD_PRIORITY_MAIN - 1,
THREAD_CREATE_STACKTEST, _server_thread, port_str,
"UDP server") <= KERNEL_PID_UNDEF) {
return 1;
}
return 0;
}
int udp_cmd(int argc, char **argv)
{
if (argc < 2) {
printf("usage: %s [send|server]\n", argv[0]);
return 1;
}
if (strcmp(argv[1], "send") == 0) {
uint32_t num = 1;
uint32_t delay = 1000000;
if (argc < 5) {
printf("usage: %s send <addr> <port> <hex data> [<num> [<delay in us>]]\n",
argv[0]);
return 1;
}
if (argc > 5) {
num = (uint32_t)atoi(argv[5]);
}
if (argc > 6) {
delay = (uint32_t)atoi(argv[6]);
}
return udp_send(argv[2], argv[3], argv[4], num, delay);
}
else if (strcmp(argv[1], "server") == 0) {
if (argc < 3) {
printf("usage: %s server [start|stop]\n", argv[0]);
return 1;
}
if (strcmp(argv[2], "start") == 0) {
if (argc < 4) {
printf("usage %s server start <port>\n", argv[0]);
return 1;
}
return udp_start_server(argv[3]);
}
else {
puts("error: invalid command");
return 1;
}
}
else {
puts("error: invalid command");
return 1;
}
}
#else
typedef int dont_be_pedantic;
#endif
/** @} */