Move common 6LoWPAN code to new file lopwan6_common.c

This is mainly IPHC (de)compression.

TODO: adapt the 6LoWPAN-over-BLE netif to this.

Signed-off-by: goldsimon <goldsimon@gmx.de>
This commit is contained in:
goldsimon
2018-03-14 22:29:16 +01:00
parent c974fc9d43
commit a4b9beef04
9 changed files with 937 additions and 711 deletions

View File

@@ -39,14 +39,6 @@
#include "lwip/opt.h"
/** Helper define for a MAC address, which can be encoded as 0, 2 or 8 bytes */
struct ieee_802154_addr {
/* encoded length of the address */
u8_t addr_len;
/* address bytes */
u8_t addr[8];
};
#ifdef PACK_STRUCT_USE_INCLUDES
# include "arch/bpstruct.h"
#endif

View File

@@ -44,8 +44,9 @@
#include "netif/lowpan6_opts.h"
#if LWIP_IPV6 && LWIP_6LOWPAN /* don't build if not configured for use in lwipopts.h */
#if LWIP_IPV6
#include "netif/lowpan6_common.h"
#include "lwip/pbuf.h"
#include "lwip/ip.h"
#include "lwip/ip_addr.h"
@@ -83,6 +84,6 @@ err_t tcpip_6lowpan_input(struct pbuf *p, struct netif *inp);
}
#endif
#endif /* LWIP_IPV6 && LWIP_6LOWPAN */
#endif /* LWIP_IPV6 */
#endif /* LWIP_HDR_LOWPAN6_H */

View File

@@ -0,0 +1,82 @@
/**
* @file
*
* Common 6LowPAN routines for IPv6. Uses ND tables for link-layer addressing. Fragments packets to 6LowPAN units.
*/
/*
* Copyright (c) 2015 Inico Technologies Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the lwIP TCP/IP stack.
*
* Author: Ivan Delamer <delamer@inicotech.com>
*
*
* Please coordinate changes and requests with Ivan Delamer
* <delamer@inicotech.com>
*/
#ifndef LWIP_HDR_LOWPAN6_COMMON_H
#define LWIP_HDR_LOWPAN6_COMMON_H
#include "netif/lowpan6_opts.h"
#if LWIP_IPV6 /* don't build if IPv6 is disabled in lwipopts.h */
#include "lwip/pbuf.h"
#include "lwip/ip.h"
#include "lwip/ip6_addr.h"
#include "lwip/netif.h"
#ifdef __cplusplus
extern "C" {
#endif
/** Helper define for a link layer address, which can be encoded as 0, 2 or 8 bytes */
struct lowpan6_link_addr {
/* encoded length of the address */
u8_t addr_len;
/* address bytes */
u8_t addr[8];
};
s8_t lowpan6_get_address_mode(const ip6_addr_t *ip6addr, const struct lowpan6_link_addr *mac_addr);
#if LWIP_6LOWPAN_IPHC
err_t lowpan6_compress_headers(struct netif *netif, u8_t *inbuf, size_t inbuf_size, u8_t *outbuf, size_t outbuf_size,
u8_t *lowpan6_header_len_out, u8_t *hidden_header_len_out, ip6_addr_t *lowpan6_contexts,
const struct lowpan6_link_addr *src, const struct lowpan6_link_addr *dst);
struct pbuf *lowpan6_decompress(struct pbuf *p, u16_t datagram_size, ip6_addr_t *lowpan6_contexts,
struct lowpan6_link_addr *src, struct lowpan6_link_addr *dest);
#endif /* LWIP_6LOWPAN_IPHC */
#ifdef __cplusplus
}
#endif
#endif /* LWIP_IPV6 */
#endif /* LWIP_HDR_LOWPAN6_COMMON_H */

View File

@@ -43,32 +43,51 @@
#include "lwip/opt.h"
#ifndef LWIP_6LOWPAN
#define LWIP_6LOWPAN 0
#endif
/** LWIP_6LOWPAN_NUM_CONTEXTS: define the number of compression
* contexts per netif type
*/
#ifndef LWIP_6LOWPAN_NUM_CONTEXTS
#define LWIP_6LOWPAN_NUM_CONTEXTS 10
#endif
/** LWIP_6LOWPAN_INFER_SHORT_ADDRESS: set this to 0 to disable creating
* short addresses for matching addresses (debug only)
*/
#ifndef LWIP_6LOWPAN_INFER_SHORT_ADDRESS
#define LWIP_6LOWPAN_INFER_SHORT_ADDRESS 1
#endif
/** LWIP_6LOWPAN_IPHC: set this to 0 to disable IP header compression as per
* RFC 6282 (which is mandatory for BLE)
*/
#ifndef LWIP_6LOWPAN_IPHC
#define LWIP_6LOWPAN_IPHC 1
#endif
#ifndef LWIP_6LOWPAN_HW_CRC
#define LWIP_6LOWPAN_HW_CRC 0
/** Set this to 1 if your IEEE 802.15.4 interface can calculate and check the
* CRC in hardware. This means TX packets get 2 zero bytes added on transmission
* which are to be filled with the CRC.
*/
#ifndef LWIP_6LOWPAN_802154_HW_CRC
#define LWIP_6LOWPAN_802154_HW_CRC 0
#endif
/** If LWIP_6LOWPAN_802154_HW_CRC==0, this can override the default slow
* implementation of the CRC used for 6LoWPAN over IEEE 802.15.4 (which uses
* a shift register).
*/
#ifndef LWIP_6LOWPAN_CALC_CRC
#define LWIP_6LOWPAN_CALC_CRC(buf, len) lowpan6_calc_crc(buf, len)
#endif
#ifndef LOWPAN6_DEBUG
#define LOWPAN6_DEBUG LWIP_DBG_OFF
/** Debug level for 6LoWPAN in general */
#ifndef LWIP_LOWPAN6_DEBUG
#define LWIP_LOWPAN6_DEBUG LWIP_DBG_OFF
#endif
/** Debug level for 6LoWPAN over IEEE 802.15.4 */
#ifndef LWIP_LOWPAN6_802154_DEBUG
#define LWIP_LOWPAN6_802154_DEBUG LWIP_DBG_OFF
#endif
#endif /* LWIP_HDR_LOWPAN6_OPTS_H */

View File

@@ -43,7 +43,7 @@
#include "lwip/opt.h"
#include "netif/lowpan6.h"
#if LWIP_IPV6 && LWIP_6LOWPAN /* don't build if not configured for use in lwipopts.h */
#if LWIP_IPV6 /* don't build if not configured for use in lwipopts.h */
#include "lwip/netif.h"
@@ -76,6 +76,6 @@ err_t zepif_init(struct netif *netif);
}
#endif
#endif /* LWIP_IPV6 && LWIP_6LOWPAN */
#endif /* LWIP_IPV6 */
#endif /* LWIP_HDR_ZEPIF_H */