Merge pull request #2898 from authmillenon/ng_ipv6_ext/feat/initial
ng_ipv6_ext: initial import of extension header handling (including RPL SRH)dev/timer
Martine Lenders
8 years ago
commit
e3bdc53c37
@ -0,0 +1,107 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup net_ng_ipv6_ext IPv6 extension headers.
|
||||
* @ingroup net_ng_ipv6
|
||||
* @brief Implementation of IPv6 extension headers
|
||||
* @see <a href="https://tools.ietf.org/html/rfc2460#section-4">
|
||||
* RFC 2460, section 4
|
||||
* </a>
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
* @brief Definititions for IPv6 extension headers
|
||||
*
|
||||
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
|
||||
*/
|
||||
|
||||
|
||||
#ifndef NG_IPV6_EXT_H_
|
||||
#define NG_IPV6_EXT_H_
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "byteorder.h"
|
||||
#include "kernel_types.h"
|
||||
#include "net/ng_pkt.h"
|
||||
|
||||
#include "net/ng_ipv6/ext/rh.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define NG_IPV6_EXT_LEN_UNIT (8U) /**< Unit in byte for the extension header's
|
||||
* length field */
|
||||
|
||||
/**
|
||||
* @brief IPv6 extension headers.
|
||||
*
|
||||
* @see <a href="https://tools.ietf.org/html/rfc2460#section-4">
|
||||
* RFC 2460, section 4.1
|
||||
* </a>
|
||||
*/
|
||||
typedef struct __attribute__((packed)) {
|
||||
uint8_t nh; /**< next header */
|
||||
uint8_t len; /**< length in 8 octets without first octet */
|
||||
} ng_ipv6_ext_t;
|
||||
|
||||
/**
|
||||
* @brief Demultiplex extension headers according to @p nh.
|
||||
*
|
||||
* @internal
|
||||
*
|
||||
* @param[in] iface The receiving interface.
|
||||
* @param[in] pkt A packet.
|
||||
* @param[in] nh A protocol number (see @ref net_ng_protnum).
|
||||
*
|
||||
* @return true, on success.
|
||||
* @return false, on failure.
|
||||
*/
|
||||
bool ng_ipv6_ext_demux(kernel_pid_t iface, ng_pktsnip_t *pkt,
|
||||
uint8_t nh);
|
||||
|
||||
/**
|
||||
* @brief Gets the next extension header in a packet.
|
||||
*
|
||||
* @param[in] ext The current extension header.
|
||||
*
|
||||
* @return The next extension header.
|
||||
*/
|
||||
static inline ng_ipv6_ext_t *ng_ipv6_ext_get_next(ng_ipv6_ext_t *ext)
|
||||
{
|
||||
return (ng_ipv6_ext_t *)((uint8_t *)(ext) +
|
||||
(ext->len * NG_IPV6_EXT_LEN_UNIT) +
|
||||
NG_IPV6_EXT_LEN_UNIT);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Builds an extension header for sending.
|
||||
*
|
||||
* @param[in] ipv6 The IPv6 header. Can be NULL.
|
||||
* @param[in] next The next header. Must be a successor to @p ipv6 if it is
|
||||
* not NULL.
|
||||
* @param[in] nh @ref net_ng_protnum of the next header.
|
||||
* @param[in] size Size of the extension header.
|
||||
*
|
||||
* @return The extension header on success.
|
||||
* @return NULL, on error.
|
||||
*/
|
||||
ng_pktsnip_t *ng_ipv6_ext_build(ng_pktsnip_t *ipv6, ng_pktsnip_t *next,
|
||||
uint8_t nh, size_t size);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* NG_IPV6_EXT_H_ */
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
@ -0,0 +1,61 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup net_ng_ipv6_ext_rh IPv6 routing header extension
|
||||
* @ingroup net_ng_ipv6_ext
|
||||
* @brief Implementation of IPv6 routing header extension.
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
* @brief Routing extension header definitions.
|
||||
*
|
||||
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
|
||||
*/
|
||||
#ifndef NG_IPV6_EXT_RH_H_
|
||||
#define NG_IPV6_EXT_RH_H_
|
||||
|
||||
#include "net/ng_ipv6/addr.h"
|
||||
#include "net/ng_ipv6/hdr.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief IPv6 routing extension header.
|
||||
*
|
||||
* @see <a href="https://tools.ietf.org/html/rfc2460#section-4.4">
|
||||
* RFC 2460, section 4.4
|
||||
* </a>
|
||||
*
|
||||
* @extends ng_ipv6_ext_t
|
||||
*/
|
||||
typedef struct __attribute__((packed)) {
|
||||
uint8_t nh; /**< next header */
|
||||
uint8_t len; /**< length in 8 octets without first octet */
|
||||
uint8_t type; /**< identifier of a particular routing header type */
|
||||
uint8_t seg_left; /**< number of route segments remaining */
|
||||
} ng_ipv6_ext_rh_t;
|
||||
|
||||
/**
|
||||
* @brief Extract next hop from the routing header of an IPv6 packet.
|
||||
*
|
||||
* @param[in] ipv6 An IPv6 packet.
|
||||
*
|
||||
* @return next hop on success, on success
|
||||
* @return NULL, if not found.
|
||||
*/
|
||||
ng_ipv6_addr_t *ng_ipv6_ext_rh_next_hop(ng_ipv6_hdr_t *ipv6);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* NG_IPV6_EXT_RH_H_ */
|
||||
/** @} */
|
||||
@ -0,0 +1,33 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup net_ng_rpl New RPL
|
||||
* @ingroup net
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
* @brief TODO
|
||||
*
|
||||
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
|
||||
*/
|
||||
#ifndef NG_RPL_H_
|
||||
#define NG_RPL_H_
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* NG_RPL_H_ */
|
||||
/** @} */
|
||||
@ -0,0 +1,69 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup net_rpl_srh RPL source routing header extension
|
||||
* @ingroup net_rpl
|
||||
* @brief Implementation of RPL source routing extension headers
|
||||
* @see <a href="https://tools.ietf.org/html/rfc6554">
|
||||
* RFC 6554
|
||||
* </a>
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
* @brief Definititions for RPL source routing extension headers
|
||||
*
|
||||
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
|
||||
*/
|
||||
#ifndef NG_RPL_SRH_H_
|
||||
#define NG_RPL_SRH_H_
|
||||
|
||||
#include "net/ng_ipv6/addr.h"
|
||||
#include "net/ng_ipv6/ext.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Type for source routing header.
|
||||
*/
|
||||
#define NG_RPL_SRH_TYPE (3U)
|
||||
|
||||
/**
|
||||
* @brief The RPL Source routing header.
|
||||
*
|
||||
* @see <a href="https://tools.ietf.org/html/rfc6554">
|
||||
* RFC 6554
|
||||
* </a>
|
||||
*
|
||||
* @extends ng_ipv6_ext_rh_t
|
||||
*/
|
||||
typedef struct __attribute__((packed)) {
|
||||
uint8_t nh; /**< next header */
|
||||
uint8_t len; /**< length in 8 octets without first octet */
|
||||
uint8_t type; /**< identifier of a particular routing header type */
|
||||
uint8_t seg_left; /**< number of route segments remaining */
|
||||
} ng_rpl_srh_t;
|
||||
|
||||
/**
|
||||
* @brief Extract next hop from the RPL source routing header.
|
||||
*
|
||||
* @param[in] rh A RPL source routing header.
|
||||
*
|
||||
* @return next hop, on success
|
||||
* @return NULL, if not found.
|
||||
*/
|
||||
ng_ipv6_addr_t *ng_rpl_srh_next_hop(ng_rpl_srh_t *rh);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* NG_RPL_SRH_H_ */
|
||||
/** @} */
|
||||
@ -0,0 +1,3 @@
|
||||
MODULE = ng_ipv6_ext
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
@ -0,0 +1,111 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#include "utlist.h"
|
||||
#include "net/ng_pktbuf.h"
|
||||
#include "net/ng_ipv6.h"
|
||||
|
||||
#include "net/ng_ipv6/ext.h"
|
||||
|
||||
bool ng_ipv6_ext_demux(kernel_pid_t iface, ng_pktsnip_t *pkt,
|
||||
uint8_t nh)
|
||||
{
|
||||
ng_pktsnip_t *ext_snip;
|
||||
ng_ipv6_ext_t *ext;
|
||||
unsigned int offset = 0;
|
||||
|
||||
ext = ((ng_ipv6_ext_t *)(((uint8_t *)pkt->data) + sizeof(ng_ipv6_hdr_t)));
|
||||
|
||||
bool c = true;
|
||||
|
||||
while (c) {
|
||||
switch (nh) {
|
||||
case NG_PROTNUM_IPV6_EXT_HOPOPT:
|
||||
case NG_PROTNUM_IPV6_EXT_DST:
|
||||
case NG_PROTNUM_IPV6_EXT_RH:
|
||||
case NG_PROTNUM_IPV6_EXT_FRAG:
|
||||
case NG_PROTNUM_IPV6_EXT_AH:
|
||||
case NG_PROTNUM_IPV6_EXT_ESP:
|
||||
case NG_PROTNUM_IPV6_EXT_MOB:
|
||||
/* TODO: add handling of types */
|
||||
nh = ext->nh;
|
||||
offset += ((ext->len * NG_IPV6_EXT_LEN_UNIT) + NG_IPV6_EXT_LEN_UNIT);
|
||||
ext = ng_ipv6_ext_get_next((ng_ipv6_ext_t *)ext);
|
||||
break;
|
||||
|
||||
default:
|
||||
c = false;
|
||||
offset += ((ext->len * NG_IPV6_EXT_LEN_UNIT) + NG_IPV6_EXT_LEN_UNIT);
|
||||
ext = ng_ipv6_ext_get_next((ng_ipv6_ext_t *)ext);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ext_snip = ng_pktbuf_add(pkt, pkt->data, offset, NG_NETTYPE_IPV6);
|
||||
|
||||
if (ext_snip == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ng_ipv6_demux(iface, pkt, nh); /* demultiplex next header */
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
ng_pktsnip_t *ng_ipv6_ext_build(ng_pktsnip_t *ipv6, ng_pktsnip_t *next,
|
||||
uint8_t nh, size_t size)
|
||||
{
|
||||
ng_pktsnip_t *prev = NULL, *snip;
|
||||
ng_ipv6_ext_t *ext;
|
||||
|
||||
if (ipv6 != NULL) {
|
||||
LL_SEARCH_SCALAR(ipv6, prev, next, next);
|
||||
|
||||
if (prev == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (size < NG_IPV6_EXT_LEN_UNIT) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
snip = ng_pktbuf_add(next, NULL, size, NG_NETTYPE_IPV6);
|
||||
|
||||
if (snip == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ext = snip->data;
|
||||
|
||||
ext->nh = nh;
|
||||
|
||||
if (size & 0x7) { /* not divisible by eight */
|
||||
ext->len = (size / NG_IPV6_EXT_LEN_UNIT);
|
||||
}
|
||||
else {
|
||||
ext->len = (size / NG_IPV6_EXT_LEN_UNIT) - 1;
|
||||
}
|
||||
|
||||
if (prev != NULL) {
|
||||
prev->next = snip;
|
||||
}
|
||||
|
||||
return snip;
|
||||
}
|
||||
|
||||
|
||||
/** @} */
|
||||
@ -0,0 +1,3 @@
|
||||
MODULE = ng_ipv6_ext_rh
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
@ -0,0 +1,62 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
*/
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "net/ng_protnum.h"
|
||||
#include "net/ng_rpl/srh.h"
|
||||
#include "net/ng_ipv6/ext/rh.h"
|
||||
|
||||
ng_ipv6_addr_t *ng_ipv6_ext_rh_next_hop(ng_ipv6_hdr_t *ipv6)
|
||||
{
|
||||
ng_ipv6_ext_rh_t *ext = (ng_ipv6_ext_rh_t *)(ipv6 + 1);
|
||||
bool c = true;
|
||||
|
||||
while (c) {
|
||||
switch (ext->type) {
|
||||
case NG_PROTNUM_IPV6_EXT_HOPOPT:
|
||||
case NG_PROTNUM_IPV6_EXT_DST:
|
||||
case NG_PROTNUM_IPV6_EXT_FRAG:
|
||||
case NG_PROTNUM_IPV6_EXT_AH:
|
||||
case NG_PROTNUM_IPV6_EXT_ESP:
|
||||
case NG_PROTNUM_IPV6_EXT_MOB:
|
||||
ext = (ng_ipv6_ext_rh_t *)ng_ipv6_ext_get_next((ng_ipv6_ext_t *)ext);
|
||||
break;
|
||||
|
||||
case NG_PROTNUM_IPV6_EXT_RH:
|
||||
c = false;
|
||||
break;
|
||||
|
||||
default:
|
||||
c = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (ipv6->nh == NG_PROTNUM_IPV6_EXT_RH) {
|
||||
switch (ext->type) {
|
||||
#ifdef MODULE_NG_RPL_SRH
|
||||
case NG_RPL_SRH_TYPE:
|
||||
return ng_rpl_srh_next_hop((ng_rpl_srh_t *)ext);
|
||||
#endif
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/** @} */
|
||||
@ -0,0 +1,24 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
*/
|
||||
|
||||
#include "net/ng_rpl/srh.h"
|
||||
|
||||
ng_ipv6_addr_t *ng_rpl_srh_next_hop(ng_rpl_srh_t *rh)
|
||||
{
|
||||
/* TODO */
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/** @} */
|
||||
Loading…
Reference in New Issue