sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IP forwarding: Add some fragments of TCP forwarding logic.

Browse Source
This commit is contained in:
Gregory Nutt 2017-07-03 15:58:01 -06:00
parent 81cd76484f
commit 83a875f394
4 changed files with 172 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
net/devif/ipv6_forward.c
View File

@ -166,7 +166,7 @@ static int ipv6_packet_conversion(FAR struct net_driver_s *dev,
static int ipv6_hdrsize(FAR struct ipv6_hdr_s *ipv6) static int ipv6_hdrsize(FAR struct ipv6_hdr_s *ipv6)
{ {
/* Copy the following protocol header, */ /* Size is determined by the following protocol header, */
switch (ipv6->proto) switch (ipv6->proto)
{ {
@ -211,27 +211,20 @@ static int ipv6_hdrsize(FAR struct ipv6_hdr_s *ipv6)
* Description: * Description:
* Set up to forward the UDP or ICMPv6 packet on the specified device. * Set up to forward the UDP or ICMPv6 packet on the specified device.
* This function will set up a send "interrupt" handler that will perform * This function will set up a send "interrupt" handler that will perform
* the actual send asynchronously. * the actual send asynchronously and must return without waiting for the
* send to complete.
* *
* Input Parameters: * Input Parameters:
* dev - The device on which the packet was received and which contains * dev - The device on which the packet should be forwarded.
* the IPv6 packet. * ipv6 - A pointer to the IPv6 header in within the IPv6 packet. This
* ipv6 - A convenience pointer to the IPv6 header in within the IPv6 * is immeidately followed by the L3 header which may be UDP or
* packet. This is immeidately followed by the L3 header which may * ICMPv6.
* be UDP or ICMPv6.
* iob - A list of IOBs containing the data payload to be sent. * iob - A list of IOBs containing the data payload to be sent.
* *
*
* On input:
* - dev->d_buf holds the received packet.
* - dev->d_len holds the length of the received packet MINUS the
* size of the L1 header. That was subtracted out by ipv6_input.
* - ipv6 points to the IPv6 header with dev->d_buf.
*
* Returned Value: * Returned Value:
* Zero is returned if the packet was successfully forward; A negated * Zero is returned if the packet was successfully forwarded; A negated
* errno value is returned if the packet is not forwardable. In that * errno value is returned if the packet is not forwardable. In that
* latter case, the caller (ipv6_input()) should drop the packet. * latter case, the caller should free the IOB list and drop the packet.
* *
****************************************************************************/ ****************************************************************************/
@ -242,9 +235,7 @@ static int ipv6_dev_forward(FAR struct net_driver_s *dev,
{ {
/* Notify the forwarding device that TX data is available */ /* Notify the forwarding device that TX data is available */
/* Set up to send the packet when the selected device polls for TX data. /* Set up to send the packet when the selected device polls for TX data. */
* If the packet is TCP, it must obey ACK and windowing rules.
*/
#warning Missing logic #warning Missing logic
@ -252,11 +243,8 @@ static int ipv6_dev_forward(FAR struct net_driver_s *dev,
* - source MAC, the MAC of the current device. * - source MAC, the MAC of the current device.
* - dest MAC, the MAC associated with the destination IPv6 adress. * - dest MAC, the MAC associated with the destination IPv6 adress.
* This will involve ICMPv6 and Neighbor Discovery. * This will involve ICMPv6 and Neighbor Discovery.
* - Because of TCP window, the packet may have to be sent in smaller
* pieces.
*/ */
# warning Missing logic
nwarn("WARNING: UPD/ICMPv6 packet forwarding not yet supported\n"); nwarn("WARNING: UPD/ICMPv6 packet forwarding not yet supported\n");
return -ENOSYS; return -ENOSYS;
} }
@ -280,11 +268,31 @@ static int ipv6_dev_forward(FAR struct net_driver_s *dev,
#ifdef CONFIG_NET_STATISTICS #ifdef CONFIG_NET_STATISTICS
static void ipv6_dropstats(FAR struct ipv6_hdr_s *ipv) static void ipv6_dropstats(FAR struct ipv6_hdr_s *ipv)
{ {
g_netstats.icmpv6.drop++ switch (ipv6->proto)
g_netstats.udp.drop++; {
g_netstats.tcp.drop++; #ifdef CONFIG_NET_TCP
case IP_PROTO_TCP:
g_netstats.tcp.drop++;
break;
#endif
g_netstats.ipv6.drop++ #ifdef CONFIG_NET_UDP
case IP_PROTO_UDP:
g_netstats.udp.drop++;
break;
#endif
#ifdef CONFIG_NET_ICMPv6
case IP_PROTO_ICMP6:
g_netstats.icmpv6.drop++
break;
#endif
default:
break;
}
g_netstats.ipv6.drop++
} }
#else #else
# define ipv6_dropstats(ipv6) # define ipv6_dropstats(ipv6)
@ -410,11 +418,11 @@ int ipv6_forward(FAR struct net_driver_s *dev, FAR struct ipv6_hdr_s *ipv6)
if (ipv6->proto == IP_PROTO_TCP) if (ipv6->proto == IP_PROTO_TCP)
{ {
ret = tcp_ipv6_forward(dev, ipv6, iob); ret = tcp_ipv6_forward(fwddev, ipv6, iob);
} }
else else
{ {
ret = ipv6_dev_forward(dev, ipv6, iob); ret = ipv6_dev_forward(fwddev, ipv6, iob);
} }
if (ret >= 0) if (ret >= 0)

6
net/tcp/Make.defs
View File

@ -60,6 +60,12 @@ NET_CSRCS += tcp_conn.c tcp_seqno.c tcp_devpoll.c tcp_finddev.c tcp_timer.c
NET_CSRCS += tcp_send.c tcp_input.c tcp_appsend.c tcp_listen.c NET_CSRCS += tcp_send.c tcp_input.c tcp_appsend.c tcp_listen.c
NET_CSRCS += tcp_callback.c tcp_backlog.c tcp_ipselect.c NET_CSRCS += tcp_callback.c tcp_backlog.c tcp_ipselect.c
# IP forwarding
ifeq ($(CONFIG_NET_IPFORWARD),y)
NET_CSRCS += tcp_forward.c
endif
# TCP write buffering # TCP write buffering
ifeq ($(CONFIG_NET_TCP_WRITE_BUFFERS),y) ifeq ($(CONFIG_NET_TCP_WRITE_BUFFERS),y)

28
net/tcp/tcp.h
View File

@ -794,6 +794,34 @@ int tcp_accept_connection(FAR struct net_driver_s *dev,
void tcp_send(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, void tcp_send(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t flags, uint16_t len); uint16_t flags, uint16_t len);
/****************************************************************************
* Name: tcp_ipv6_forward
*
* Description:
* Set up to forward the TCP packet on the specified device. This
* function will set up a send "interrupt" handler that will perform
* the actual send asynchronously and must return without waiting for the
* send to complete.
*
* Input Parameters:
* dev - The device on which the packet should be forwarded.
* ipv6 - A pointer to the IPv6 header in within the IPv6 packet. This
* is immeidately followed by the TCP header.
* iob - A list of IOBs containing the data payload to be sent.
*
* Returned Value:
* Zero is returned if the packet was successfully forwarded; A negated
* errno value is returned if the packet is not forwardable. In that
* latter case, the caller should free the IOB list and drop the packet.
*
****************************************************************************/
#if defined(CONFIG_NET_IPFORWARD) && defined(CONFIG_NET_IPv6) && \
defined(CONFIG_NETDEV_MULTINIC)
int tcp_ipv6_forward(FAR struct net_driver_s *dev,
FAR struct ipv6_hdr_s *ipv6, FAR struct iob_s *iob);
#endif
/**************************************************************************** /****************************************************************************
* Name: tcp_reset * Name: tcp_reset
* *

101
net/tcp/tcp_forward.c Normal file
View File

@ -0,0 +1,101 @@
/****************************************************************************
* net/tcp/tcp_forward.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/mm/iob.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/ip.h>
#include "tcp/tcp.h"
#if defined(CONFIG_NET) && defined(CONFIG_NET_IPFORWARD) && defined(CONFIG_NET_TCP)
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: tcp_ipv6_forward
*
* Description:
* Set up to forward the TCP packet on the specified device. This
* function will set up a send "interrupt" handler that will perform
* the actual send asynchronously and must return without waiting for the
* send to complete.
*
* Input Parameters:
* dev - The device on which the packet should be forwarded.
* ipv6 - A pointer to the IPv6 header in within the IPv6 packet. This
* is immeidately followed by the TCP header.
* iob - A list of IOBs containing the data payload to be sent.
*
* Returned Value:
* Zero is returned if the packet was successfully forwarded; A negated
* errno value is returned if the packet is not forwardable. In that
* latter case, the caller should free the IOB list and drop the packet.
*
****************************************************************************/
#if defined(CONFIG_NET_IPv6) && defined(CONFIG_NETDEV_MULTINIC)
int tcp_ipv6_forward(FAR struct net_driver_s *dev,
FAR struct ipv6_hdr_s *ipv6, FAR struct iob_s *iob)
{
/* Notify the forwarding device that TX data is available */
/* Set up to send the packet when the selected device polls for TX data.
* TCP packets must obey ACK and windowing rules.
*/
#warning Missing logic
/* REVISIT: For Ethernet we may have to fix up the Ethernet header:
* - source MAC, the MAC of the current device.
* - dest MAC, the MAC associated with the destination IPv6 adress.
* This will involve ICMPv6 and Neighbor Discovery.
* - Because of TCP window, the packet may have to be sent in smaller
* pieces.
*/
nwarn("WARNING: TCP packet forwarding not yet supported\n");
return -ENOSYS;
}
#endif /* CONFIG_NET_IPv6 && CONFIG_NETDEV_MULTINIC */
#endif /* CONFIG_NET && CONFIG_NET_IPFORWARD && CONFIG_NET_TCP */