From 52ead055fda1b20760b93797857ef8283f3624fb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 1 Apr 2017 09:07:16 -0600 Subject: [PATCH] 6loWPAN: Beginning of IEEE802.15.4 frame input logic. --- drivers/net/skeleton.c | 2 +- include/nuttx/net/netdev.h | 3 +- include/nuttx/net/sixlowpan.h | 62 +++- net/sixlowpan/Make.defs | 4 +- net/sixlowpan/sixlowpan_framelist.c | 473 +++++++++++++++++++++++++++ net/sixlowpan/sixlowpan_framer.c | 6 +- net/sixlowpan/sixlowpan_hc06.c | 10 +- net/sixlowpan/sixlowpan_hc1.c | 8 +- net/sixlowpan/sixlowpan_input.c | 244 ++++++++++++-- net/sixlowpan/sixlowpan_internal.h | 53 ++- net/sixlowpan/sixlowpan_send.c | 479 ++-------------------------- net/sixlowpan/sixlowpan_tcpsend.c | 4 +- net/sixlowpan/sixlowpan_udpsend.c | 4 +- 13 files changed, 849 insertions(+), 503 deletions(-) create mode 100644 net/sixlowpan/sixlowpan_framelist.c diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c index b33c46e6e0..d354ab8130 100644 --- a/drivers/net/skeleton.c +++ b/drivers/net/skeleton.c @@ -437,8 +437,8 @@ static void skel_receive(FAR struct skel_driver_s *priv) skel_transmit(priv); } } -#endif else +#endif { NETDEV_RXDROPPED(&priv->sk_dev); } diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h index 72bddc067c..12b71840d7 100644 --- a/include/nuttx/net/netdev.h +++ b/include/nuttx/net/netdev.h @@ -419,7 +419,8 @@ int ipv6_input(FAR struct net_driver_s *dev); #endif #ifdef CONFIG_NET_6LOWPAN -int sixlowpan_input(FAR struct net_driver_s *dev); +struct ieee802154_driver_s; /* See sixlowpan.h */ +int sixlowpan_input(FAR struct ieee802154_driver_s *ieee); #endif /**************************************************************************** diff --git a/include/nuttx/net/sixlowpan.h b/include/nuttx/net/sixlowpan.h index db4bbd1d02..f31c453c43 100644 --- a/include/nuttx/net/sixlowpan.h +++ b/include/nuttx/net/sixlowpan.h @@ -260,7 +260,7 @@ */ -#define FRAME_IOB_EMPTY(ieee) ((ieee)->framelist == NULL) +#define FRAME_IOB_EMPTY(ieee) ((ieee)->i_framelist == NULL) #define FRAME_IOB_REMOVE(ieee, iob) \ do \ { \ @@ -369,6 +369,11 @@ struct rimeaddr_s * * The MAC driver should then inform the network of the by calling * sixlowpan_input(). + * + * Normally, the network will free the IOB and will nullify the frame + * list. But ss a complexity, the result of receiving a frame may be + * that the network may respond provide an outgoing frames in the + * frame list. */ struct ieee802154_driver_s @@ -458,6 +463,61 @@ struct sixlowpan_nhcompressor_s * Public Function Prototypes ****************************************************************************/ +/**************************************************************************** + * Name: sixlowpan_input + * + * Description: + * Process an incoming 6loWPAN frame. + * + * This function is called when the device driver has received a 6loWPAN + * frame from the network. The frame from the device driver must be + * provided in a IOB present in the i_framelist: The frame data is in the + * IOB io_data[] buffer and the length of the frame is in the IOB io_len + * field. Only a single IOB is expected in the i_framelist. This incoming + * data will be processed one frame at a time. + * + * An non-NULL d_buf of size CONFIG_NET_6LOWPAN_MTU must also be provided. + * The frame will be decompressed and placed in the d_buf. Fragmented + * packets will also be reassembled in the d_buf as they are received + * (meaning for the driver, that two packet buffers are required: One for + * reassembly of RX packets and one used for TX polling). + * + * After each frame is processed into d_buf, the IOB is removed and + * deallocated. i_framelist will be nullified. If reassembly is + * incomplete, this function will return to called with i_framelist + * equal to NULL. The partially reassembled packet must be preserved by + * the IEEE802.15.4 MAC and provided again when the next frame is + * received. + * + * When the packet in the d_buf is fully reassembled, it will be provided + * to the network as with any other received packet. d_len will be set + * the the length of the uncompressed, reassembled packet. + * + * After the network processes the packet, d_len will be set to zero. + * Network logic may also decide to send a response to the packet. In + * that case, the outgoing network packet will be placed in d_buf the + * d_buf and d_len will be set to a non-zero value. That case is handled + * by this function. + * + * If that case occurs, the packet will be converted to a list of + * compressed and possibly fragmented frames in i_framelist as with other + * TX operations. + * + * So from the standpoint of the IEEE802.15.4 MAC driver, there are two + * possible results: (1) i_framelist is NULL meaning that the frame + * was fully processed and freed, or (2) i_framelist is non-NULL meaning + * that there are outgoing frame(s) to be sent. + * + * Input Parameters: + * ieee - The IEEE802.15.4 MAC network driver interface. + * + * Returned Value: + * Ok is returned on success; Othewise a negated errno value is returned. + * + ****************************************************************************/ + +int sixlowpan_input(FAR struct ieee802154_driver_s *ieee); + /**************************************************************************** * Function: sixlowpan_set_compressor * diff --git a/net/sixlowpan/Make.defs b/net/sixlowpan/Make.defs index becc0a7edd..09fc742d39 100644 --- a/net/sixlowpan/Make.defs +++ b/net/sixlowpan/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # net/sixlowpan/Make.defs # -# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ ifeq ($(CONFIG_NET_6LOWPAN),y) NET_CSRCS += sixlowpan_initialize.c sixlowpan_globals.c sixlowpan_utils.c NET_CSRCS += sixlowpan_input.c sixlowpan_send.c sixlowpan_framer.c -NET_CSRCS += sixlowpan_compressor.c +NET_CSRCS += sixlowpan_framelist.c sixlowpan_compressor.c ifeq ($(CONFIG_NET_TCP),y) NET_CSRCS += sixlowpan_tcpsend.c diff --git a/net/sixlowpan/sixlowpan_framelist.c b/net/sixlowpan/sixlowpan_framelist.c new file mode 100644 index 0000000000..35750b3ce7 --- /dev/null +++ b/net/sixlowpan/sixlowpan_framelist.c @@ -0,0 +1,473 @@ +/**************************************************************************** + * net/sixlowpan/sixlowpan_framelist.c + * + * Copyright (C) 2017 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Parts of this file derive from Contiki: + * + * Copyright (c) 2008, Swedish Institute of Computer Science. + * All rights reserved. + * Authors: Adam Dunkels + * Nicolas Tsiftes + * Niclas Finne + * Mathilde Durvy + * Julien Abeille + * Joakim Eriksson + * Joel Hoglund + * + * 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. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include + +#include + +#include "sixlowpan/sixlowpan_internal.h" + +#ifdef CONFIG_NET_6LOWPAN + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ + +/* A single IOB must be big enough to hold a full frame */ + +#if CONFIG_IOB_BUFSIZE < CONFIG_NET_6LOWPAN_FRAMELEN +# error IOBs must be large enough to hold full IEEE802.14.5 frame +#endif + +/* There must be at least enough IOBs to hold the full MTU. Probably still + * won't work unless there are a few more. + */ + +#if CONFIG_NET_6LOWPAN_MTU > (CONFIG_IOB_BUFSIZE * CONFIG_IOB_NBUFFERS) +# error Not enough IOBs to hold one full IEEE802.14.5 packet +#endif + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: sixlowpan_compress_ipv6hdr + * + * Description: + * IPv6 dispatch "compression" function. Packets "Compression" when only + * IPv6 dispatch is used + * + * There is no compression in this case, all fields are sent + * inline. We just add the IPv6 dispatch byte before the packet. + * + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | IPv6 Dsp | IPv6 header and payload ... + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * Input Parameters: + * ieee - Pointer to IEEE802.15.4 MAC driver structure. + * ipv6 - Pointer to the IPv6 header to "compress" + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void sixlowpan_compress_ipv6hdr(FAR struct ieee802154_driver_s *ieee, + FAR const struct ipv6_hdr_s *ipv6) +{ + /* Indicate the IPv6 dispatch and length */ + + *g_rimeptr = SIXLOWPAN_DISPATCH_IPV6; + g_rime_hdrlen += SIXLOWPAN_IPV6_HDR_LEN; + + /* Copy the IPv6 header and adjust pointers */ + + memcpy(g_rimeptr + g_rime_hdrlen, ipv6, IPv6_HDRLEN); + g_rime_hdrlen += IPv6_HDRLEN; + g_uncomp_hdrlen += IPv6_HDRLEN; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: sixlowpan_queue_frames + * + * Description: + * Process an outgoing UDP or TCP packet. This function is called from + * send interrupt logic when a TX poll is received. It formates the + * list of frames to be sent by the IEEE802.15.4 MAC driver. + * + * The payload data is in the caller 's_buf' and is of length 's_len'. + * Compressed headers will be added and if necessary the packet is + * fragmented. The resulting packet/fragments are put in ieee->i_framelist + * and the entire list of frames will be delivered to the 802.15.4 MAC via + * ieee->i_framelist. + * + * Input Parameters: + * ieee - The IEEE802.15.4 MAC driver instance + * ipv6hdr - IPv6 header followed by TCP or UDP header. + * buf - Data to send + * len - Length of data to send + * destmac - The IEEE802.15.4 MAC address of the destination + * + * Returned Value: + * Ok is returned on success; Othewise a negated errno value is returned. + * This function is expected to fail if the driver is not an IEEE802.15.4 + * MAC network driver. In that case, the UDP/TCP will fall back to normal + * IPv4/IPv6 formatting. + * + * Assumptions: + * Called with the network locked. + * + ****************************************************************************/ + +int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee, + FAR const struct ipv6_hdr_s *destip, + FAR const void *buf, size_t len, + FAR const struct rimeaddr_s *destmac) +{ + FAR struct iob_s *iob; + int framer_hdrlen; + struct rimeaddr_s dest; + uint16_t outlen = 0; + + /* Initialize global data. Locking the network guarantees that we have + * exclusive use of the global values for intermediate calculations. + */ + + FRAME_RESET(); + g_uncomp_hdrlen = 0; + g_rime_hdrlen = 0; + /* REVISIT: Do I need this rimeptr? */ + g_rimeptr = &ieee->i_dev.d_buf[PACKETBUF_HDR_SIZE]; + + /* Reset rime buffer, packet buffer metatadata */ + + memset(g_pktattrs, 0, PACKETBUF_NUM_ATTRS * sizeof(uint16_t)); + memset(g_pktaddrs, 0, PACKETBUF_NUM_ADDRS * sizeof(struct rimeaddr_s)); + + g_pktattrs[PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS] = + CONFIG_NET_6LOWPAN_MAX_MACTRANSMITS; + + /* Set stream mode for all TCP packets, except FIN packets. */ + + if (destip->proto == IP_PROTO_TCP) + { + FAR const struct tcp_hdr_s *tcp = + &((FAR const struct ipv6tcp_hdr_s *)destip)->tcp; + + if ((tcp->flags & TCP_FIN) == 0 && + (tcp->flags & TCP_CTL) != TCP_ACK) + { + g_pktattrs[PACKETBUF_ATTR_PACKET_TYPE] = PACKETBUF_ATTR_PACKET_TYPE_STREAM; + } + else if ((tcp->flags & TCP_FIN) == TCP_FIN) + { + g_pktattrs[PACKETBUF_ATTR_PACKET_TYPE] = PACKETBUF_ATTR_PACKET_TYPE_STREAM_END; + } + } + + /* The destination address will be tagged to each outbound packet. If the + * argument destmac is NULL, we are sending a broadcast packet. + */ + + if (destmac == NULL) + { + memset(&dest, 0, sizeof(struct rimeaddr_s)); + } + else + { + rimeaddr_copy(&dest, (FAR const struct rimeaddr_s *)destmac); + } + + ninfo("Sending packet len %d\n", len); + +#ifndef CONFIG_NET_6LOWPAN_COMPRESSION_IPv6 + if (len >= CONFIG_NET_6LOWPAN_COMPRESSION_THRESHOLD) + { + /* Try to compress the headers */ + +#if defined(CONFIG_NET_6LOWPAN_COMPRESSION_HC1) + sixlowpan_compresshdr_hc1(ieee, &dest); +#elif defined(CONFIG_NET_6LOWPAN_COMPRESSION_HC06) + sixlowpan_compresshdr_hc06(ieee, &dest); +#else +# error No compression specified +#endif + } + else +#endif /* !CONFIG_NET_6LOWPAN_COMPRESSION_IPv6 */ + { + /* Small.. use IPv6 dispatch (no compression) */ + + sixlowpan_compress_ipv6hdr(ieee, destip); + } + + ninfo("Header of len %d\n", g_rime_hdrlen); + + rimeaddr_copy(&g_pktaddrs[PACKETBUF_ADDR_RECEIVER], &dest); + + /* Pre-calculate frame header length. */ + + framer_hdrlen = sixlowpan_hdrlen(ieee, ieee->i_panid); + if (framer_hdrlen < 0) + { + /* Failed to determine the size of the header failed. */ + + nerr("ERROR: sixlowpan_hdrlen() failed: %d\n", framer_hdrlen); + return framer_hdrlen; + } + + /* Check if we need to fragment the packet into several frames */ + + if ((int)len - (int)g_uncomp_hdrlen > + (int)CONFIG_NET_6LOWPAN_MAXPAYLOAD - framer_hdrlen - + (int)g_rime_hdrlen) + { +#if CONFIG_NET_6LOWPAN_FRAG + /* ieee->i_framelist will hold the generated frames; frames will be + * added at qtail. + */ + + FAR struct iob_s *qtail; + int verify; + + /* The outbound IPv6 packet is too large to fit into a single 15.4 + * packet, so we fragment it into multiple packets and send them. + * The first fragment contains frag1 dispatch, then + * IPv6/HC1/HC06/HC_UDP dispatchs/headers. + * The following fragments contain only the fragn dispatch. + */ + + ninfo("Fragmentation sending packet len %d\n", len); + + /* Allocate an IOB to hold the first fragment, waiting if necessary. */ + + iob = iob_alloc(false); + DEBUGASSERT(iob != NULL); + + /* Initialize the IOB */ + + iob->io_flink = NULL; + iob->io_len = 0; + iob->io_offset = 0; + iob->io_pktlen = 0; + + /* Create 1st Fragment */ + /* Add the frame header */ + + verify = sixlowpan_framecreate(ieee, iob, ieee->i_panid); + DEBUGASSERT(verify == framer_hdrlen); + UNUSED(verify); + + /* Move HC1/HC06/IPv6 header */ + + memmove(g_rimeptr + SIXLOWPAN_FRAG1_HDR_LEN, g_rimeptr, g_rime_hdrlen); + + /* Setup up the fragment header. + * + * The fragment header contains three fields: Datagram size, datagram + * tag and datagram offset: + * + * 1. Datagram size describes the total (un-fragmented) payload. + * 2. Datagram tag identifies the set of fragments and is used to + * match fragments of the same payload. + * 3. Datagram offset identifies the fragment’s offset within the un- + * fragmented payload. + * + * The fragment header length is 4 bytes for the first header and 5 + * bytes for all subsequent headers. + */ + + PUTINT16(RIME_FRAG_PTR, RIME_FRAG_DISPATCH_SIZE, + ((SIXLOWPAN_DISPATCH_FRAG1 << 8) | len)); + PUTINT16(RIME_FRAG_PTR, RIME_FRAG_TAG, ieee->i_dgramtag); + ieee->i_dgramtag++; + + /* Copy payload and enqueue */ + + g_rime_hdrlen += SIXLOWPAN_FRAG1_HDR_LEN; + g_rime_payloadlen = + (CONFIG_NET_6LOWPAN_MAXPAYLOAD - framer_hdrlen - g_rime_hdrlen) & 0xf8; + + memcpy(g_rimeptr + g_rime_hdrlen, + (FAR uint8_t *)destip + g_uncomp_hdrlen, g_rime_payloadlen); + iob->io_len += g_rime_payloadlen + g_rime_hdrlen; + + /* Set outlen to what we already sent from the IP payload */ + + outlen = g_rime_payloadlen + g_uncomp_hdrlen; + + ninfo("First fragment: len %d, tag %d\n", + g_rime_payloadlen, ieee->i_dgramtag); + + /* Add the first frame to the IOB queue */ + + ieee->i_framelist = iob; + qtail = iob; + + /* Keep track of the total amount of data queue */ + + iob->io_pktlen = iob->io_len; + + /* Create following fragments */ + + g_rime_hdrlen = SIXLOWPAN_FRAGN_HDR_LEN; + + while (outlen < len) + { + /* Allocate an IOB to hold the next fragment, waiting if + * necessary. + */ + + iob = iob_alloc(false); + DEBUGASSERT(iob != NULL); + + /* Initialize the IOB */ + + iob->io_flink = NULL; + iob->io_len = 0; + iob->io_offset = 0; + iob->io_pktlen = 0; + + /* Add the frame header */ + + verify = sixlowpan_framecreate(ieee, iob, ieee->i_panid); + DEBUGASSERT(vreify == framer_hdrlen); + UNUSED(verify); + + /* Move HC1/HC06/IPv6 header */ + + memmove(g_rimeptr + SIXLOWPAN_FRAGN_HDR_LEN, g_rimeptr, g_rime_hdrlen); + + /* Setup up the fragment header */ + + PUTINT16(RIME_FRAG_PTR, RIME_FRAG_DISPATCH_SIZE, + ((SIXLOWPAN_DISPATCH_FRAGN << 8) | len)); + PUTINT16(RIME_FRAG_PTR, RIME_FRAG_TAG, ieee->i_dgramtag); + RIME_FRAG_PTR[RIME_FRAG_OFFSET] = outlen >> 3; + + /* Copy payload and enqueue */ + + if (len - outlen < g_rime_payloadlen) + { + /* Last fragment */ + + g_rime_payloadlen = len - outlen; + } + else + { + g_rime_payloadlen = + (CONFIG_NET_6LOWPAN_MAXPAYLOAD - framer_hdrlen - g_rime_hdrlen) & 0xf8; + } + + memcpy(g_rimeptr + g_rime_hdrlen, (FAR uint8_t *)destip + outlen, + g_rime_payloadlen); + iob->io_len = g_rime_payloadlen + g_rime_hdrlen; + + /* Set outlen to what we already sent from the IP payload */ + + outlen += (g_rime_payloadlen + g_uncomp_hdrlen); + + ninfo("sixlowpan output: fragment offset %d, len %d, tag %d\n", + outlen >> 3, g_rime_payloadlen, ieee->i_dgramtag); + + /* Add the next frame to the tail of the IOB queue */ + + qtail->io_flink = iob; + + /* Keep track of the total amount of data queue */ + + ieee->i_framelist->io_pktlen += iob->io_len; + } +#else + nerr("ERROR: Packet too large: %d\n", len); + nerr(" Cannot to be sent without fragmentation support\n"); + nerr(" dropping packet\n"); + + return -E2BIG; +#endif + } + else + { + int verify; + + /* The packet does not need to be fragmented just copy the "payload" + * and send in one frame. + */ + + /* Allocate an IOB to hold the frame, waiting if necessary. */ + + iob = iob_alloc(false); + DEBUGASSERT(iob != NULL); + + /* Initialize the IOB */ + + iob->io_flink = NULL; + iob->io_len = 0; + iob->io_offset = 0; + iob->io_pktlen = 0; + + /* Add the frame header */ + + verify = sixlowpan_framecreate(ieee, iob, ieee->i_panid); + DEBUGASSERT(vreify == framer_hdrlen); + UNUSED(verify); + + /* Copy the payload and queue */ + + memcpy(g_rimeptr + g_rime_hdrlen, (FAR uint8_t *)destip + g_uncomp_hdrlen, + len - g_uncomp_hdrlen); + iob->io_len = len - g_uncomp_hdrlen + g_rime_hdrlen; + + /* Add the first frame to the IOB queue */ + + ieee->i_framelist = iob; + + /* Keep track of the total amount of data queue */ + + iob->io_pktlen = iob->io_len; + } + + return OK; +} + +#endif /* CONFIG_NET_6LOWPAN */ diff --git a/net/sixlowpan/sixlowpan_framer.c b/net/sixlowpan/sixlowpan_framer.c index ab5fc06fe3..d0efa291d4 100644 --- a/net/sixlowpan/sixlowpan_framer.c +++ b/net/sixlowpan/sixlowpan_framer.c @@ -518,8 +518,10 @@ int sixlowpan_802154_framecreate(FAR struct frame802154_s *finfo, * Function: sixlowpan_framecreate * * Description: - * This function is called after the IEEE802.15.4 MAC driver polls for - * TX data. It creates the IEEE802.15.4 header in the frame buffer. + * This function is called after eiether (1) the IEEE802.15.4 MAC driver + * polls for TX data or (2) after the IEEE802.15.4 MAC driver provides an + * in frame and the network responds with an outgoing packet. It creates + * the IEEE802.15.4 header in the frame buffer. * * Input parameters: * ieee - A reference IEEE802.15.4 MAC network device structure. diff --git a/net/sixlowpan/sixlowpan_hc06.c b/net/sixlowpan/sixlowpan_hc06.c index e8d0cf3d89..e0ca657c03 100644 --- a/net/sixlowpan/sixlowpan_hc06.c +++ b/net/sixlowpan/sixlowpan_hc06.c @@ -168,7 +168,7 @@ void sixlowpan_hc06_initialize(void) } /**************************************************************************** - * Name: sixlowpan_hc06_initialize + * Name: sixlowpan_compresshdr_hc06 * * Description: * Compress IP/UDP header @@ -202,7 +202,7 @@ void sixlowpan_hc06_initialize(void) * compress the IID. * * Input Parameters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * destaddr - L2 destination address, needed to compress IP dest * * Returned Value: @@ -210,7 +210,7 @@ void sixlowpan_hc06_initialize(void) * ****************************************************************************/ -void sixlowpan_compresshdr_hc06(FAR struct net_driver_s *dev, +void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee, FAR struct rimeaddr_s *destaddr) { /* REVISIT: To be provided */ @@ -230,7 +230,7 @@ void sixlowpan_compresshdr_hc06(FAR struct net_driver_s *dev, * appropriate values * * Input Parmeters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * iplen - Equal to 0 if the packet is not a fragment (IP length is then * inferred from the L2 length), non 0 if the packet is a 1st * fragment. @@ -240,7 +240,7 @@ void sixlowpan_compresshdr_hc06(FAR struct net_driver_s *dev, * ****************************************************************************/ -void sixlowpan_uncompresshdr_hc06(FAR struct net_driver_s *dev, +void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee, uint16_t iplen) { /* REVISIT: To be provided */ diff --git a/net/sixlowpan/sixlowpan_hc1.c b/net/sixlowpan/sixlowpan_hc1.c index 245a7465c2..268f0bad3e 100644 --- a/net/sixlowpan/sixlowpan_hc1.c +++ b/net/sixlowpan/sixlowpan_hc1.c @@ -102,7 +102,7 @@ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * * Input Parmeters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * destaddr - L2 destination address, needed to compress the IP * destination field * @@ -111,7 +111,7 @@ * ****************************************************************************/ -void sixlowpan_compresshdr_hc1(FAR struct net_driver_s *dev, +void sixlowpan_compresshdr_hc1(FAR struct ieee802154_driver_s *ieee, FAR struct rimeaddr_s *destaddr) { /* REVISIT: To be provided */ @@ -130,7 +130,7 @@ void sixlowpan_compresshdr_hc1(FAR struct net_driver_s *dev, * are set to the appropriate values * * Input Parameters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * iplen - Equal to 0 if the packet is not a fragment (IP length is then * inferred from the L2 length), non 0 if the packet is a 1st * fragment. @@ -140,7 +140,7 @@ void sixlowpan_compresshdr_hc1(FAR struct net_driver_s *dev, * ****************************************************************************/ -void sixlowpan_uncompresshdr_hc1(FAR struct net_driver_s *dev, +void sixlowpan_uncompresshdr_hc1(FAR struct ieee802154_driver_s *ieee, uint16_t iplen) { /* REVISIT: To be provided */ diff --git a/net/sixlowpan/sixlowpan_input.c b/net/sixlowpan/sixlowpan_input.c index 466069f2d5..151d205f85 100644 --- a/net/sixlowpan/sixlowpan_input.c +++ b/net/sixlowpan/sixlowpan_input.c @@ -1,35 +1,45 @@ /**************************************************************************** * net/sixlowpan/sixlowpan_input.c + * 6lowpan implementation (RFC4944 and draft-ietf-6lowpan-hc-06) * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2017, Gregory Nutt, all rights reserved * Author: Gregory Nutt * + * Derives in large part from Contiki: + * + * Copyright (c) 2008, Swedish Institute of Computer Science. + * All rights reserved. + * Authors: Adam Dunkels + * Nicolas Tsiftes + * Niclas Finne + * Mathilde Durvy + * Julien Abeille + * Joakim Eriksson + * Joel Hoglund + * * 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. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 - * COPYRIGHT OWNER OR CONTRIBUTORS 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 SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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. * ****************************************************************************/ @@ -39,13 +49,31 @@ #include +#include #include +#include #include "nuttx/net/netdev.h" +#include "nuttx/net/ip.h" +#include "nuttx/net/sixlowpan.h" + +#ifdef CONFIG_NET_PKT +# include "pkt/pkt.h" +#endif + #include "sixlowpan/sixlowpan_internal.h" #ifdef CONFIG_NET_6LOWPAN +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Success return values from sixlowpan_frame_process */ + +#define INPUT_PARTIAL 0 /* Frame processed successful, packet incomplete */ +#define INPUT_COMPLETE 1 /* Frame processed successful, packet complete */ + /**************************************************************************** * Public Functions ****************************************************************************/ @@ -135,6 +163,73 @@ static void sixlowpan_set_pktattrs(FAR struct ieee802154_driver_s *ieee, g_pktattrs[PACKETBUF_ATTR_CHANNEL] = attr; } +/**************************************************************************** + * Name: sixlowpan_frame_process + * + * Description: + * Process an incoming 6loWPAN frame in 'iob'. + * + * If its a FRAG1 or a non-fragmented frame we first uncompress the IP + * header. The 6loWPAN payload and possibly the uncompressed IP header + * are then copied into d_buf. An indication is returned if the packet + * in d_buf is complete (i.e., non-fragmented frame or and the last + * FRAGN frame). + * + * NOTE: We do not check for overlapping sixlowpan fragments (that is a + * SHALL in the RFC 4944 and should never happen) + * + * Input Parameters: + * ieee - The IEEE802.15.4 MAC network driver interface. + * iob - The IOB containing the frame. + * + * Returned Value: + * Ok is returned on success; Othewise a negated errno value is returned. + * + ****************************************************************************/ + +static int sixlowpan_frame_process(FAR struct ieee802154_driver_s *ieee, + FAR struct iob_s *iob) +{ + /* REVISIT: To be provided */ + return -ENOSYS; +} + +/**************************************************************************** + * Function: sixlowpan_dispatch + * + * Description: + * Inject the packet in d_buf into the network for normal packet processing. + * + * Parameters: + * ieee - The IEEE802.15.4 MAC network driver interface. + * + * Returned Value: + * None + * + ****************************************************************************/ + +static int sixlowpan_dispatch(FAR struct ieee802154_driver_s *ieee) +{ +#ifdef CONFIG_NET_PKT + /* When packet sockets are enabled, feed the frame into the packet tap */ + + ninfo("Packet tap\n"); + pkt_input(&ieee->i_dev); +#endif + + /* We only accept IPv6 packets. */ + + ninfo("Iv6 packet dispatch\n"); + NETDEV_RXIPV6(&ieee->i_dev); + + /* Give the IPv6 packet to the network layer. NOTE: If there is a + * problem with IPv6 header, it will be silently dropped and d_len will + * be set to zero. Oddly, ipv6_input() will return OK in this case. + */ + + return ipv6_input(&ieee->i_dev); +} + /**************************************************************************** * Public Functions ****************************************************************************/ @@ -143,30 +238,117 @@ static void sixlowpan_set_pktattrs(FAR struct ieee802154_driver_s *ieee, * Name: sixlowpan_input * * Description: - * Process an incoming IP packet. + * Process an incoming 6loWPAN frame. * * This function is called when the device driver has received a 6loWPAN - * packet from the network. The packet from the device driver must be - * present in the d_buf buffer, and the length of the packet should be - * placed in the d_len field. + * frame from the network. The frame from the device driver must be + * provided in a IOB present in the i_framelist: The frame data is in the + * IOB io_data[] buffer and the length of the frame is in the IOB io_len + * field. Only a single IOB is expected in the i_framelist. This incoming + * data will be processed one frame at a time. * - * When the function returns, there may be an outbound packet placed - * in the d_buf packet buffer. If so, the d_len field is set to - * the length of the packet. If no packet is to be sent out, the - * d_len field is set to 0. + * An non-NULL d_buf of size CONFIG_NET_6LOWPAN_MTU must also be provided. + * The frame will be decompressed and placed in the d_buf. Fragmented + * packets will also be reassembled in the d_buf as they are received + * (meaning for the driver, that two packet buffers are required: One for + * reassembly of RX packets and one used for TX polling). + * + * After each frame is processed into d_buf, the IOB is removed and + * deallocated. i_framelist will be nullified. If reassembly is + * incomplete, this function will return to called with i_framelist + * equal to NULL. The partially reassembled packet must be preserved by + * the IEEE802.15.4 MAC and provided again when the next frame is + * received. + * + * When the packet in the d_buf is fully reassembled, it will be provided + * to the network as with any other received packet. d_len will be set + * the the length of the uncompressed, reassembled packet. + * + * After the network processes the packet, d_len will be set to zero. + * Network logic may also decide to send a response to the packet. In + * that case, the outgoing network packet will be placed in d_buf the + * d_buf and d_len will be set to a non-zero value. That case is handled + * by this function. + * + * If that case occurs, the packet will be converted to a list of + * compressed and possibly fragmented frames in i_framelist as with other + * TX operations. + * + * So from the standpoint of the IEEE802.15.4 MAC driver, there are two + * possible results: (1) i_framelist is NULL meaning that the frame + * was fully processed and freed, or (2) i_framelist is non-NULL meaning + * that there are outgoing frame(s) to be sent. * * Input Parameters: - * dev - The IEEE802.15.4 MAC network driver interface. + * ieee - The IEEE802.15.4 MAC network driver interface. * * Returned Value: * Ok is returned on success; Othewise a negated errno value is returned. * ****************************************************************************/ -int sixlowpan_input(FAR struct net_driver_s *dev) +int sixlowpan_input(FAR struct ieee802154_driver_s *ieee) { - /* REVISIT: To be provided */ - return -ENOSYS; + int ret = -EINVAL; + + DEBUGASSERT(ieee != NULL && !FRAME_IOB_EMPTY(ieee)); + + /* Verify that an IOB is provided in the device structure */ + + while (!FRAME_IOB_EMPTY(ieee)) + { + FAR struct iob_s *iob; + + /* Remove the IOB containing the frame from the device structure */ + + FRAME_IOB_REMOVE(ieee, iob); + DEBUGASSERT(iob != NULL); + + /* Process the frame, decompressing it into the packet buffer */ + + ret = sixlowpan_frame_process(ieee, iob); + + /* Was the frame successfully processed? Is the packet in d_buf fully + * reassembled? + */ + + if (ret == INPUT_COMPLETE) + { + /* Inject the uncompressed, reassembled packet into the network */ + + ret = sixlowpan_dispatch(ieee); + if (ret >= 0) + { + /* Check if this resulted in a request to send an outgoing + * packet. + */ + + if (ieee->i_dev.d_len > 0) + { + FAR struct ipv6_hdr_s *ipv6hdr; + struct rimeaddr_s destmac; + + /* The IPv6 header followed by TCP or UDP headers should + * lie at the beginning of d_buf since there is no link + * layer protocol header. + */ + + ipv6hdr = (FAR struct ipv6_hdr_s *)(ieee->i_dev.d_buf); + + /* Get the Rime MAC address of the destination */ +#warning Missing logic + + /* Convert the outgoing packet into a frame list. */ + + ret = sixlowpan_queue_frames(ieee, ipv6hdr, ieee->i_dev.d_buf, + ieee->i_dev.d_len, &destmac); + ieee->i_dev.d_len = 0; + } + } + } + } + + return ret; } #endif /* CONFIG_NET_6LOWPAN */ diff --git a/net/sixlowpan/sixlowpan_internal.h b/net/sixlowpan/sixlowpan_internal.h index d96c4213b7..644880398f 100644 --- a/net/sixlowpan/sixlowpan_internal.h +++ b/net/sixlowpan/sixlowpan_internal.h @@ -481,6 +481,43 @@ int sixlowpan_hdrlen(FAR struct ieee802154_driver_s *ieee, int sixlowpan_framecreate(FAR struct ieee802154_driver_s *ieee, FAR struct iob_s *iob, uint16_t dest_panid); +/**************************************************************************** + * Name: sixlowpan_queue_frames + * + * Description: + * Process an outgoing UDP or TCP packet. This function is called from + * send interrupt logic when a TX poll is received. It formates the + * list of frames to be sent by the IEEE802.15.4 MAC driver. + * + * The payload data is in the caller 's_buf' and is of length 's_len'. + * Compressed headers will be added and if necessary the packet is + * fragmented. The resulting packet/fragments are put in ieee->i_framelist + * and the entire list of frames will be delivered to the 802.15.4 MAC via + * ieee->i_framelist. + * + * Input Parameters: + * ieee - The IEEE802.15.4 MAC driver instance + * ipv6hdr - IPv6 header followed by TCP or UDP header. + * buf - Data to send + * len - Length of data to send + * destmac - The IEEE802.15.4 MAC address of the destination + * + * Returned Value: + * Ok is returned on success; Othewise a negated errno value is returned. + * This function is expected to fail if the driver is not an IEEE802.15.4 + * MAC network driver. In that case, the UDP/TCP will fall back to normal + * IPv4/IPv6 formatting. + * + * Assumptions: + * Called with the network locked. + * + ****************************************************************************/ + +int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee, + FAR const struct ipv6_hdr_s *ipv6hdr, + FAR const void *buf, size_t len, + FAR const struct rimeaddr_s *destmac); + /**************************************************************************** * Name: sixlowpan_hc06_initialize * @@ -521,7 +558,7 @@ void sixlowpan_hc06_initialize(void); * compression * * Input Parameters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * destaddr - L2 destination address, needed to compress IP dest * * Returned Value: @@ -530,7 +567,7 @@ void sixlowpan_hc06_initialize(void); ****************************************************************************/ #ifdef CONFIG_NET_6LOWPAN_COMPRESSION_HC06 -void sixlowpan_compresshdr_hc06(FAR struct net_driver_s *dev, +void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *dev, FAR struct rimeaddr_s *destaddr); #endif @@ -548,7 +585,7 @@ void sixlowpan_compresshdr_hc06(FAR struct net_driver_s *dev, * appropriate values * * Input Parmeters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * iplen - Equal to 0 if the packet is not a fragment (IP length is then * inferred from the L2 length), non 0 if the packet is a 1st * fragment. @@ -559,7 +596,7 @@ void sixlowpan_compresshdr_hc06(FAR struct net_driver_s *dev, ****************************************************************************/ #ifdef CONFIG_NET_6LOWPAN_COMPRESSION_HC06 -void sixlowpan_uncompresshdr_hc06(FAR struct net_driver_s *dev, +void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee, uint16_t iplen); #endif @@ -574,7 +611,7 @@ void sixlowpan_uncompresshdr_hc06(FAR struct net_driver_s *dev, * uip_buf buffer. * * Input Parmeters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * destaddr - L2 destination address, needed to compress the IP * destination field * @@ -584,7 +621,7 @@ void sixlowpan_uncompresshdr_hc06(FAR struct net_driver_s *dev, ****************************************************************************/ #ifdef CONFIG_NET_6LOWPAN_COMPRESSION_HC1 -void sixlowpan_compresshdr_hc1(FAR struct net_driver_s *dev, +void sixlowpan_compresshdr_hc1(FAR struct ieee802154_driver_s *ieee, FAR struct rimeaddr_s *destaddr); #endif @@ -601,7 +638,7 @@ void sixlowpan_compresshdr_hc1(FAR struct net_driver_s *dev, * are set to the appropriate values * * Input Parameters: - * dev - A reference to the IEE802.15.4 network device state + * ieee - A reference to the IEE802.15.4 network device state * iplen - Equal to 0 if the packet is not a fragment (IP length is then * inferred from the L2 length), non 0 if the packet is a 1st * fragment. @@ -612,7 +649,7 @@ void sixlowpan_compresshdr_hc1(FAR struct net_driver_s *dev, ****************************************************************************/ #ifdef CONFIG_NET_6LOWPAN_COMPRESSION_HC1 -void sixlowpan_uncompresshdr_hc1(FAR struct net_driver_s *dev, +void sixlowpan_uncompresshdr_hc1(FAR struct ieee802154_driver_s *ieee, uint16_t ip_len); #endif diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c index 12420a2574..cff92eecee 100644 --- a/net/sixlowpan/sixlowpan_send.c +++ b/net/sixlowpan/sixlowpan_send.c @@ -4,18 +4,6 @@ * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * - * Parts of this file derive from Contiki: - * - * Copyright (c) 2008, Swedish Institute of Computer Science. - * All rights reserved. - * Authors: Adam Dunkels - * Nicolas Tsiftes - * Niclas Finne - * Mathilde Durvy - * Julien Abeille - * Joakim Eriksson - * Joel Hoglund - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,23 +11,25 @@ * 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. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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 SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 + * COPYRIGHT OWNER OR CONTRIBUTORS 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. * ****************************************************************************/ @@ -49,46 +39,21 @@ #include -#include -#include +#include #include #include -#include "nuttx/semaphore.h" -#include "nuttx/net/net.h" -#include "nuttx/net/netdev.h" -#include "nuttx/net/iob.h" -#include "nuttx/net/ip.h" +#include +#include +#include -#include "iob/iob.h" #include "netdev/netdev.h" #include "devif/devif.h" -#include "tcp/tcp.h" -#include "udp/udp.h" + #include "sixlowpan/sixlowpan_internal.h" #ifdef CONFIG_NET_6LOWPAN -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Configuration ************************************************************/ - -/* A single IOB must be big enough to hold a full frame */ - -#if CONFIG_IOB_BUFSIZE < CONFIG_NET_6LOWPAN_FRAMELEN -# error IOBs must be large enough to hold full IEEE802.14.5 frame -#endif - -/* There must be at least enough IOBs to hold the full MTU. Probably still - * won't work unless there are a few more. - */ - -#if CONFIG_NET_6LOWPAN_MTU > (CONFIG_IOB_BUFSIZE * CONFIG_IOB_NBUFFERS) -# error Not enough IOBs to hold one full IEEE802.14.5 packet -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -105,7 +70,7 @@ struct sixlowpan_send_s int s_result; /* The result of the transfer */ uint16_t s_timeout; /* Send timeout in deciseconds */ systime_t s_time; /* Last send time for determining timeout */ - FAR const struct ipv6_hdr_s *s_destip; /* Destination IP address */ + FAR const struct ipv6_hdr_s *s_ipv6hdr; /* IPv6 header, followed by UDP or TCP header. */ FAR const struct rimeaddr_s *s_destmac; /* Destination MAC address */ FAR const void *s_buf; /* Data to send */ size_t s_len; /* Length of data in buf */ @@ -115,384 +80,6 @@ struct sixlowpan_send_s * Private Functions ****************************************************************************/ -/**************************************************************************** - * Name: sixlowpan_compress_ipv6hdr - * - * Description: - * IPv6 dispatch "compression" function. Packets "Compression" when only - * IPv6 dispatch is used - * - * There is no compression in this case, all fields are sent - * inline. We just add the IPv6 dispatch byte before the packet. - * - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | IPv6 Dsp | IPv6 header and payload ... - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * - * Input Parameters: - * ieee - Pointer to IEEE802.15.4 MAC driver structure. - * ipv6 - Pointer to the IPv6 header to "compress" - * - * Returned Value: - * None - * - ****************************************************************************/ - -static void sixlowpan_compress_ipv6hdr(FAR struct ieee802154_driver_s *ieee, - FAR const struct ipv6_hdr_s *ipv6) -{ - /* Indicate the IPv6 dispatch and length */ - - *g_rimeptr = SIXLOWPAN_DISPATCH_IPV6; - g_rime_hdrlen += SIXLOWPAN_IPV6_HDR_LEN; - - /* Copy the IPv6 header and adjust pointers */ - - memcpy(g_rimeptr + g_rime_hdrlen, ipv6, IPv6_HDRLEN); - g_rime_hdrlen += IPv6_HDRLEN; - g_uncomp_hdrlen += IPv6_HDRLEN; -} - -/**************************************************************************** - * Name: sixlowpan_queue_frames - * - * Description: - * Process an outgoing UDP or TCP packet. This function is called from - * send interrupt logic when a TX poll is received. It formates the - * list of frames to be sent by the IEEE802.15.4 MAC driver. - * - * The payload data is in the caller 's_buf' and is of length 's_len'. - * Compressed headers will be added and if necessary the packet is - * fragmented. The resulting packet/fragments are put in ieee->i_framelist - * and the entire list of frames will be delivered to the 802.15.4 MAC via - * ieee->i_framelist. - * - * Input Parameters: - * dev - The structure of the network driver that caused the interrupt - * sinfo - Send state information - * - * Returned Value: - * Ok is returned on success; Othewise a negated errno value is returned. - * This function is expected to fail if the driver is not an IEEE802.15.4 - * MAC network driver. In that case, the UDP/TCP will fall back to normal - * IPv4/IPv6 formatting. - * - * Assumptions: - * Called with the network locked. - * - ****************************************************************************/ - -int sixlowpan_queue_frames(FAR struct net_driver_s *dev, - FAR struct sixlowpan_send_s *sinfo) -{ - FAR struct ieee802154_driver_s *ieee = (FAR struct ieee802154_driver_s *)dev; - FAR struct iob_s *iob; - int framer_hdrlen; - struct rimeaddr_s dest; - uint16_t outlen = 0; - - /* Initialize global data. Locking the network guarantees that we have - * exclusive use of the global values for intermediate calculations. - */ - - FRAME_RESET(); - g_uncomp_hdrlen = 0; - g_rime_hdrlen = 0; - /* REVISIT: Do I need this rimeptr? */ - g_rimeptr = &dev->d_buf[PACKETBUF_HDR_SIZE]; - - /* Reset rime buffer, packet buffer metatadata */ - - memset(g_pktattrs, 0, PACKETBUF_NUM_ATTRS * sizeof(uint16_t)); - memset(g_pktaddrs, 0, PACKETBUF_NUM_ADDRS * sizeof(struct rimeaddr_s)); - - g_pktattrs[PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS] = - CONFIG_NET_6LOWPAN_MAX_MACTRANSMITS; - - /* Set stream mode for all TCP packets, except FIN packets. */ - - if (sinfo->s_destip->proto == IP_PROTO_TCP) - { - FAR const struct tcp_hdr_s *tcp = &((FAR const struct ipv6tcp_hdr_s *)sinfo->s_destip)->tcp; - - if ((tcp->flags & TCP_FIN) == 0 && - (tcp->flags & TCP_CTL) != TCP_ACK) - { - g_pktattrs[PACKETBUF_ATTR_PACKET_TYPE] = PACKETBUF_ATTR_PACKET_TYPE_STREAM; - } - else if ((tcp->flags & TCP_FIN) == TCP_FIN) - { - g_pktattrs[PACKETBUF_ATTR_PACKET_TYPE] = PACKETBUF_ATTR_PACKET_TYPE_STREAM_END; - } - } - - /* The destination address will be tagged to each outbound packet. If the - * argument destmac is NULL, we are sending a broadcast packet. - */ - - if (sinfo->s_destmac == NULL) - { - memset(&dest, 0, sizeof(struct rimeaddr_s)); - } - else - { - rimeaddr_copy(&dest, (FAR const struct rimeaddr_s *)sinfo->s_destmac); - } - - ninfo("Sending packet len %d\n", sinfo->s_len); - -#ifndef CONFIG_NET_6LOWPAN_COMPRESSION_IPv6 - if (sinfo->s_len >= CONFIG_NET_6LOWPAN_COMPRESSION_THRESHOLD) - { - /* Try to compress the headers */ - -#if defined(CONFIG_NET_6LOWPAN_COMPRESSION_HC1) - sixlowpan_compresshdr_hc1(dev, &dest); -#elif defined(CONFIG_NET_6LOWPAN_COMPRESSION_HC06) - sixlowpan_compresshdr_hc06(dev, &dest); -#else -# error No compression specified -#endif - } - else -#endif /* !CONFIG_NET_6LOWPAN_COMPRESSION_IPv6 */ - { - /* Small.. use IPv6 dispatch (no compression) */ - - sixlowpan_compress_ipv6hdr(ieee, sinfo->s_destip); - } - - ninfo("Header of len %d\n", g_rime_hdrlen); - - rimeaddr_copy(&g_pktaddrs[PACKETBUF_ADDR_RECEIVER], &dest); - - /* Pre-calculate frame header length. */ - - framer_hdrlen = sixlowpan_hdrlen(ieee, ieee->i_panid); - if (framer_hdrlen < 0) - { - /* Failed to determine the size of the header failed. */ - - nerr("ERROR: sixlowpan_hdrlen() failed: %d\n", framer_hdrlen); - return framer_hdrlen; - } - - /* Check if we need to fragment the packet into several frames */ - - if ((int)sinfo->s_len - (int)g_uncomp_hdrlen > - (int)CONFIG_NET_6LOWPAN_MAXPAYLOAD - framer_hdrlen - - (int)g_rime_hdrlen) - { -#if CONFIG_NET_6LOWPAN_FRAG - /* ieee->i_framelist will hold the generated frames; frames will be - * added at qtail. - */ - - FAR struct iob_s *qtail; - int verify; - - /* The outbound IPv6 packet is too large to fit into a single 15.4 - * packet, so we fragment it into multiple packets and send them. - * The first fragment contains frag1 dispatch, then - * IPv6/HC1/HC06/HC_UDP dispatchs/headers. - * The following fragments contain only the fragn dispatch. - */ - - ninfo("Fragmentation sending packet len %d\n", sinfo->s_len); - - /* Allocate an IOB to hold the first fragment, waiting if necessary. */ - - iob = iob_alloc(false); - DEBUGASSERT(iob != NULL); - - /* Initialize the IOB */ - - iob->io_flink = NULL; - iob->io_len = 0; - iob->io_offset = 0; - iob->io_pktlen = 0; - - /* Create 1st Fragment */ - /* Add the frame header */ - - verify = sixlowpan_framecreate(ieee, iob, ieee->i_panid); - DEBUGASSERT(vreify == framer_hdrlen); - UNUSED(verify); - - /* Move HC1/HC06/IPv6 header */ - - memmove(g_rimeptr + SIXLOWPAN_FRAG1_HDR_LEN, g_rimeptr, g_rime_hdrlen); - - /* Setup up the fragment header. - * - * The fragment header contains three fields: Datagram size, datagram - * tag and datagram offset: - * - * 1. Datagram size describes the total (un-fragmented) payload. - * 2. Datagram tag identifies the set of fragments and is used to - * match fragments of the same payload. - * 3. Datagram offset identifies the fragment’s offset within the un- - * fragmented payload. - * - * The fragment header length is 4 bytes for the first header and 5 - * bytes for all subsequent headers. - */ - - PUTINT16(RIME_FRAG_PTR, RIME_FRAG_DISPATCH_SIZE, - ((SIXLOWPAN_DISPATCH_FRAG1 << 8) | sinfo->s_len)); - PUTINT16(RIME_FRAG_PTR, RIME_FRAG_TAG, ieee->i_dgramtag); - ieee->i_dgramtag++; - - /* Copy payload and enqueue */ - - g_rime_hdrlen += SIXLOWPAN_FRAG1_HDR_LEN; - g_rime_payloadlen = - (CONFIG_NET_6LOWPAN_MAXPAYLOAD - framer_hdrlen - g_rime_hdrlen) & 0xf8; - - memcpy(g_rimeptr + g_rime_hdrlen, - (uint8_t *) sinfo->s_destip + g_uncomp_hdrlen, g_rime_payloadlen); - iob->io_len += g_rime_payloadlen + g_rime_hdrlen; - - /* Set outlen to what we already sent from the IP payload */ - - outlen = g_rime_payloadlen + g_uncomp_hdrlen; - - ninfo("First fragment: len %d, tag %d\n", - g_rime_payloadlen, ieee->i_dgramtag); - - /* Add the first frame to the IOB queue */ - - ieee->i_framelist = iob; - qtail = iob; - - /* Keep track of the total amount of data queue */ - - iob->io_pktlen = iob->io_len; - - /* Create following fragments */ - - g_rime_hdrlen = SIXLOWPAN_FRAGN_HDR_LEN; - - while (outlen < sinfo->s_len) - { - /* Allocate an IOB to hold the next fragment, waiting if - * necessary. - */ - - iob = iob_alloc(false); - DEBUGASSERT(iob != NULL); - - /* Initialize the IOB */ - - iob->io_flink = NULL; - iob->io_len = 0; - iob->io_offset = 0; - iob->io_pktlen = 0; - - /* Add the frame header */ - - verify = sixlowpan_framecreate(ieee, iob, ieee->i_panid); - DEBUGASSERT(vreify == framer_hdrlen); - UNUSED(verify); - - /* Move HC1/HC06/IPv6 header */ - - memmove(g_rimeptr + SIXLOWPAN_FRAGN_HDR_LEN, g_rimeptr, g_rime_hdrlen); - - /* Setup up the fragment header */ - - PUTINT16(RIME_FRAG_PTR, RIME_FRAG_DISPATCH_SIZE, - ((SIXLOWPAN_DISPATCH_FRAGN << 8) | sinfo->s_len)); - PUTINT16(RIME_FRAG_PTR, RIME_FRAG_TAG, ieee->i_dgramtag); - RIME_FRAG_PTR[RIME_FRAG_OFFSET] = outlen >> 3; - - /* Copy payload and enqueue */ - - if (sinfo->s_len - outlen < g_rime_payloadlen) - { - /* Last fragment */ - - g_rime_payloadlen = sinfo->s_len - outlen; - } - else - { - g_rime_payloadlen = - (CONFIG_NET_6LOWPAN_MAXPAYLOAD - framer_hdrlen - g_rime_hdrlen) & 0xf8; - } - - memcpy(g_rimeptr + g_rime_hdrlen, (FAR uint8_t *) sinfo->s_destip + outlen, - g_rime_payloadlen); - iob->io_len = g_rime_payloadlen + g_rime_hdrlen; - - /* Set outlen to what we already sent from the IP payload */ - - outlen += (g_rime_payloadlen + g_uncomp_hdrlen); - - ninfo("sixlowpan output: fragment offset %d, len %d, tag %d\n", - outlen >> 3, g_rime_payloadlen, ieee->i_dgramtag); - - /* Add the next frame to the tail of the IOB queue */ - - qtail->io_flink = iob; - - /* Keep track of the total amount of data queue */ - - ieee->i_framelist->io_pktlen += iob->io_len; - } -#else - nerr("ERROR: Packet too large: %d\n", sinfo->s_len); - nerr(" Cannot to be sent without fragmentation support\n"); - nerr(" dropping packet\n"); - - return -E2BIG; -#endif - } - else - { - int verify; - - /* The packet does not need to be fragmented just copy the "payload" - * and send in one frame. - */ - - /* Allocate an IOB to hold the frame, waiting if necessary. */ - - iob = iob_alloc(false); - DEBUGASSERT(iob != NULL); - - /* Initialize the IOB */ - - iob->io_flink = NULL; - iob->io_len = 0; - iob->io_offset = 0; - iob->io_pktlen = 0; - - /* Add the frame header */ - - verify = sixlowpan_framecreate(ieee, iob, ieee->i_panid); - DEBUGASSERT(vreify == framer_hdrlen); - UNUSED(verify); - - /* Copy the payload and queue */ - - memcpy(g_rimeptr + g_rime_hdrlen, (uint8_t *)sinfo->s_destip + g_uncomp_hdrlen, - sinfo->s_len - g_uncomp_hdrlen); - iob->io_len = sinfo->s_len - g_uncomp_hdrlen + g_rime_hdrlen; - - /* Add the first frame to the IOB queue */ - - ieee->i_framelist = iob; - - /* Keep track of the total amount of data queue */ - - iob->io_pktlen = iob->io_len; - } - - return OK; -} - /**************************************************************************** * Function: send_timeout * @@ -535,7 +122,7 @@ static inline bool send_timeout(FAR struct sixlowpan_send_s *sinfo) } /**************************************************************************** - * Function: tcpsend_interrupt + * Function: send_interrupt * * Description: * This function is called from the interrupt level to perform the actual @@ -579,7 +166,11 @@ static uint16_t send_interrupt(FAR struct net_driver_s *dev, /* Transfer the frame listto the IEEE802.15.4 MAC device */ - sinfo->s_result = sixlowpan_queue_frames(dev, sinfo); + sinfo->s_result = + sixlowpan_queue_frames((FAR struct ieee802154_driver_s *)dev, + sinfo->s_ipv6hdr, sinfo->s_buf, sinfo->s_len, + sinfo->s_destmac); + flags &= ~WPAN_POLL; goto end_wait; } @@ -632,10 +223,10 @@ end_wait: * * Input Parameters: * dev - The IEEE802.15.4 MAC network driver interface. - * ipv6 - IPv6 plus TCP or UDP headers. + * ipv6hdr - IPv6 header followed by TCP or UDP header. * buf - Data to send * len - Length of data to send - * raddr - The IEEE802.15.4 MAC address of the destination + * destmac - The IEEE802.15.4 MAC address of the destination * timeout - Send timeout in deciseconds * * Returned Value: @@ -650,8 +241,8 @@ end_wait: ****************************************************************************/ int sixlowpan_send(FAR struct net_driver_s *dev, - FAR const struct ipv6_hdr_s *ipv6, FAR const void *buf, - size_t len, FAR const struct rimeaddr_s *raddr, + FAR const struct ipv6_hdr_s *ipv6hdr, FAR const void *buf, + size_t len, FAR const struct rimeaddr_s *destmac, uint16_t timeout) { struct sixlowpan_send_s sinfo; @@ -664,8 +255,8 @@ int sixlowpan_send(FAR struct net_driver_s *dev, sinfo.s_result = -EBUSY; sinfo.s_timeout = timeout; sinfo.s_time = clock_systimer(); - sinfo.s_destip = ipv6; - sinfo.s_destmac = raddr; + sinfo.s_ipv6hdr = ipv6hdr; + sinfo.s_destmac = destmac; sinfo.s_buf = buf; sinfo.s_len = len; diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c index 7089b19b27..ba11700ab4 100644 --- a/net/sixlowpan/sixlowpan_tcpsend.c +++ b/net/sixlowpan/sixlowpan_tcpsend.c @@ -85,7 +85,7 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf, FAR struct tcp_conn_s *conn; FAR struct net_driver_s *dev; struct ipv6tcp_hdr_s ipv6tcp; - struct rimeaddr_s dest; + struct rimeaddr_s destmac; uint16_t timeout; int ret; @@ -181,7 +181,7 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf, #endif ret = sixlowpan_send(dev, (FAR const struct ipv6_hdr_s *)&ipv6tcp, - buf, len, &dest, timeout); + buf, len, &destmac, timeout); if (ret < 0) { nerr("ERROR: sixlowpan_send() failed: %d\n", ret); diff --git a/net/sixlowpan/sixlowpan_udpsend.c b/net/sixlowpan/sixlowpan_udpsend.c index 18f9ea8ac1..3b17d00767 100644 --- a/net/sixlowpan/sixlowpan_udpsend.c +++ b/net/sixlowpan/sixlowpan_udpsend.c @@ -85,7 +85,7 @@ ssize_t psock_6lowpan_udp_send(FAR struct socket *psock, FAR const void *buf, FAR struct udp_conn_s *conn; FAR struct net_driver_s *dev; struct ipv6udp_hdr_s ipv6udp; - struct rimeaddr_s dest; + struct rimeaddr_s destmac; uint16_t timeout; int ret; @@ -182,7 +182,7 @@ ssize_t psock_6lowpan_udp_send(FAR struct socket *psock, FAR const void *buf, #endif ret = sixlowpan_send(dev, (FAR const struct ipv6_hdr_s *)&ipv6udp, - buf, len, &dest, timeout); + buf, len, &destmac, timeout); if (ret < 0) { nerr("ERROR: sixlowpan_send() failed: %d\n", ret);