From d80337aee5a68f2c1f9def8cb15f61b8a476b2a9 Mon Sep 17 00:00:00 2001 From: EunBong Song Date: Mon, 13 Mar 2017 20:35:48 +0900 Subject: [PATCH] net: remove to support CONFIG_NET_SENDFILE CONFIG_NET_SENDFILE is a legacy feature from NutX and not supported any more. Let's remove all codes which are related CONFIG_NET_SENDFILE. Change-Id: I6deb2d7d2aa91a51096af61f0d055433900b006d Signed-off-by: EunBong Song --- lib/libc/misc/lib_sendfile.c | 4 - os/fs/vfs/Make.defs | 11 - os/fs/vfs/fs_sendfile.c | 172 ---------- os/include/sys/syscall.h | 11 +- os/include/tinyara/fs/fs.h | 13 - os/include/tinyara/net/net.h | 69 ---- os/net/socket/Make.defs | 6 - os/net/socket/net_sendfile.c | 736 ------------------------------------------- os/syscall/syscall.csv | 1 - os/syscall/syscall_lookup.h | 3 - 10 files changed, 2 insertions(+), 1024 deletions(-) delete mode 100644 os/fs/vfs/fs_sendfile.c delete mode 100644 os/net/socket/net_sendfile.c diff --git a/lib/libc/misc/lib_sendfile.c b/lib/libc/misc/lib_sendfile.c index c12e355..6fc9128 100644 --- a/lib/libc/misc/lib_sendfile.c +++ b/lib/libc/misc/lib_sendfile.c @@ -130,11 +130,7 @@ * ************************************************************************/ -#ifdef CONFIG_NET_SENDFILE -ssize_t lib_sendfile(int outfd, int infd, off_t *offset, size_t count) -#else ssize_t sendfile(int outfd, int infd, off_t *offset, size_t count) -#endif { FAR uint8_t *iobuffer; FAR uint8_t *wrbuffer; diff --git a/os/fs/vfs/Make.defs b/os/fs/vfs/Make.defs index 734d416..c425591 100644 --- a/os/fs/vfs/Make.defs +++ b/os/fs/vfs/Make.defs @@ -66,11 +66,6 @@ ifneq ($(CONFIG_NFILE_STREAMS),0) CSRCS += fs_fdopen.c endif -# Support for sendfile() - -ifeq ($(CONFIG_NET_SENDFILE),y) -CSRCS += fs_sendfile.c -endif # Include vfs build support @@ -103,12 +98,6 @@ ifneq ($(CONFIG_NFILE_STREAMS),0) CSRCS += fs_fdopen.c endif -# Support for sendfile() - -ifeq ($(CONFIG_NET_SENDFILE),y) -CSRCS += fs_sendfile.c -endif - # Include vfs build support DEPPATH += --dep-path vfs diff --git a/os/fs/vfs/fs_sendfile.c b/os/fs/vfs/fs_sendfile.c deleted file mode 100644 index 887ee45..0000000 --- a/os/fs/vfs/fs_sendfile.c +++ /dev/null @@ -1,172 +0,0 @@ -/**************************************************************************** - * - * Copyright 2016 Samsung Electronics All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the License. - * - ****************************************************************************/ -/************************************************************************ - * fs/vfs/fs_sendfile.c - * - * Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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 - * 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. - * - ************************************************************************/ - -/************************************************************************ - * Included Files - ************************************************************************/ - -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_NET_SENDFILE) - -/************************************************************************ - * Private types - ************************************************************************/ - -/************************************************************************ - * Private Variables - ************************************************************************/ - -/************************************************************************ - * Public Variables - ************************************************************************/ - -/************************************************************************ - * Private Functions - ************************************************************************/ - -/************************************************************************ - * Public Functions - ************************************************************************/ - -/************************************************************************ - * Name: sendfile - * - * Description: - * sendfile() copies data between one file descriptor and another. - * Used with file descriptors it basically just wraps a sequence of - * reads() and writes() to perform a copy. - * - * If the destination descriptor is a socket, it gives a better - * performance than simple reds() and writes(). The data is read directly - * into the net buffer and the whole tcp window is filled if possible. - * - * NOTE: This interface is *not* specified in POSIX.1-2001, or other - * standards. The implementation here is very similar to the Linux - * sendfile interface. Other UNIX systems implement sendfile() with - * different semantics and prototypes. sendfile() should not be used - * in portable programs. - * - * Input Parmeters: - * infd - A file (or socket) descriptor opened for reading - * outfd - A descriptor opened for writing. - * offset - If 'offset' is not NULL, then it points to a variable - * holding the file offset from which sendfile() will start - * reading data from 'infd'. When sendfile() returns, this - * variable will be set to the offset of the byte following - * the last byte that was read. If 'offset' is not NULL, - * then sendfile() does not modify the current file offset of - * 'infd'; otherwise the current file offset is adjusted to - * reflect the number of bytes read from 'infd.' - * - * If 'offset' is NULL, then data will be read from 'infd' - * starting at the current file offset, and the file offset - * will be updated by the call. - * count - The number of bytes to copy between the file descriptors. - * - * Returned Value: - * If the transfer was successful, the number of bytes written to outfd is - * returned. On error, -1 is returned, and errno is set appropriately. - * There error values are those returned by read() or write() plus: - * - * EINVAL - Bad input parameters. - * ENOMEM - Could not allocated an I/O buffer - * - ************************************************************************/ - -ssize_t sendfile(int outfd, int infd, off_t *offset, size_t count) -{ -#if defined(CONFIG_NET_TCP) && CONFIG_NSOCKET_DESCRIPTORS > 0 - - /* Check the destination file descriptor: Is it a (probable) file - * descriptor? Check the source file: Is it a normal file? - */ - - if ((unsigned int)outfd >= CONFIG_NFILE_DESCRIPTORS && (unsigned int)infd < CONFIG_NFILE_DESCRIPTORS) { - FAR struct file *filep; - - /* This appears to be a file-to-socket transfer. Get the file - * structure. - */ - - filep = fs_getfilep(fd); - if (!filep) { - /* The errno value has already been set */ - - return ERROR; - } - - /* Then let net_sendfile do the work. */ - - return net_sendfile(outfd, filep, offset, count); - } else -#endif - { - /* No... then this is probably a file-to-file transfer. The generic - * lib_sendfile() can handle that case. - */ - - return lib_sendfile(outfd, infd, offset, count); - } -} - -#endif /* CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NET_SENDFILE */ diff --git a/os/include/sys/syscall.h b/os/include/sys/syscall.h index 9637a21..bbeb053 100644 --- a/os/include/sys/syscall.h +++ b/os/include/sys/syscall.h @@ -284,16 +284,9 @@ #if CONFIG_NFILE_STREAMS > 0 #define SYS_fs_fdopen (__SYS_filedesc+16) #define SYS_sched_getstreams (__SYS_filedesc+17) -#define __SYS_sendfile (__SYS_filedesc+18) +#define __SYS_mountpoint (__SYS_filedesc+18) #else -#define __SYS_sendfile (__SYS_filedesc+16) -#endif - -#if defined(CONFIG_NET_SENDFILE) -#define SYS_sendfile, __SYS_sendfile -#define __SYS_mountpoint (__SYS_sendfile+1) -#else -#define __SYS_mountpoint __SYS_sendfile +#define __SYS_mountpoint (__SYS_filedesc+16) #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) diff --git a/os/include/tinyara/fs/fs.h b/os/include/tinyara/fs/fs.h index 7fb7ee5..b01f8ce 100644 --- a/os/include/tinyara/fs/fs.h +++ b/os/include/tinyara/fs/fs.h @@ -686,19 +686,6 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb); int lib_flushall(FAR struct streamlist *list); #endif -/* libc/misc/lib_sendfile.c *************************************************/ -/**************************************************************************** - * Name: lib_sendfile - * - * Description: - * Transfer a file - * - ****************************************************************************/ - -#ifdef CONFIG_NET_SENDFILE -ssize_t lib_sendfile(int outfd, int infd, off_t *offset, size_t count); -#endif - /* fs/fs_getfilep.c *********************************************************/ /**************************************************************************** * Name: fs_getfilep diff --git a/os/include/tinyara/net/net.h b/os/include/tinyara/net/net.h index 26d8e91..4d6b2dc 100644 --- a/os/include/tinyara/net/net.h +++ b/os/include/tinyara/net/net.h @@ -497,75 +497,6 @@ int net_dupsd2(int sockfd1, int sockfd2); int net_clone(FAR struct socket *psock1, FAR struct socket *psock2); /**************************************************************************** - * Function: net_sendfile - * - * Description: - * The send() call may be used only when the socket is in a connected state - * (so that the intended recipient is known). The only difference between - * send() and write() is the presence of flags. With zero flags parameter, - * send() is equivalent to write(). Also, send(sockfd,buf,len,flags) is - * equivalent to sendto(sockfd,buf,len,flags,NULL,0). - * - * Parameters: - * psock An instance of the internal socket structure. - * buf Data to send - * len Length of data to send - * flags Send flags - * - * Returned Value: - * On success, returns the number of characters sent. On error, - * -1 is returned, and errno is set appropriately: - * - * EAGAIN or EWOULDBLOCK - * The socket is marked non-blocking and the requested operation - * would block. - * EBADF - * An invalid descriptor was specified. - * ECONNRESET - * Connection reset by peer. - * EDESTADDRREQ - * The socket is not connection-mode, and no peer address is set. - * EFAULT - * An invalid user space address was specified for a parameter. - * EINTR - * A signal occurred before any data was transmitted. - * EINVAL - * Invalid argument passed. - * EISCONN - * The connection-mode socket was connected already but a recipient - * was specified. (Now either this error is returned, or the recipient - * specification is ignored.) - * EMSGSIZE - * The socket type requires that message be sent atomically, and the - * size of the message to be sent made this impossible. - * ENOBUFS - * The output queue for a network interface was full. This generally - * indicates that the interface has stopped sending, but may be - * caused by transient congestion. - * ENOMEM - * No memory available. - * ENOTCONN - * The socket is not connected, and no target has been given. - * ENOTSOCK - * The argument s is not a socket. - * EOPNOTSUPP - * Some bit in the flags argument is inappropriate for the socket - * type. - * EPIPE - * The local end has been shut down on a connection oriented socket. - * In this case the process will also receive a SIGPIPE unless - * MSG_NOSIGNAL is set. - * - * Assumptions: - * - ****************************************************************************/ - -#ifdef CONFIG_NET_SENDFILE -struct file; -ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset, size_t count); -#endif - -/**************************************************************************** * Name: net_vfcntl * * Description: diff --git a/os/net/socket/Make.defs b/os/net/socket/Make.defs index 5f4037d..804d2a0 100644 --- a/os/net/socket/Make.defs +++ b/os/net/socket/Make.defs @@ -71,12 +71,6 @@ ifneq ($(CONFIG_NFILE_STREAMS),0) SOCK_CSRCS += net_checksd.c endif -# Support for sendfile() - -ifeq ($(CONFIG_NET_SENDFILE),y) -SOCK_CSRCS += net_sendfile.c -endif - # Include socket build support DEPPATH += --dep-path socket diff --git a/os/net/socket/net_sendfile.c b/os/net/socket/net_sendfile.c deleted file mode 100644 index 47ca1c1..0000000 --- a/os/net/socket/net_sendfile.c +++ /dev/null @@ -1,736 +0,0 @@ -/**************************************************************************** - * - * Copyright 2016 Samsung Electronics All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * net/socket/net_sendfile.c - * - * Copyright (C) 2013 UVC Ingenieure. All rights reserved. - * Copyright (C) 2007-2015 Gregory Nutt. All rights reserved. - * Authors: Gregory Nutt - * Max Holtzberg - * - * 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 - * 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. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/* TODO: Support with LWIP socket layer */ - -#if 0 -#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "netdev/netdev.h" -#include "socket/socket.h" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#if defined(CONFIG_NET_TCP_SPLIT) && !defined(CONFIG_NET_TCP_SPLIT_SIZE) -#define CONFIG_NET_TCP_SPLIT_SIZE 40 -#endif - -#define TCPIPv4BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define TCPIPv6BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) - -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/* This structure holds the state of the send operation until it can be - * operated upon from the interrupt level. - */ - -struct sendfile_s { - FAR struct socket *snd_sock; /* Points to the parent socket structure */ - FAR struct netif_callback_s *snd_datacb; /* Data callback */ - FAR struct netif_callback_s *snd_ackcb; /* ACK callback */ - FAR struct file *snd_file; /* File structure of the input file */ - sem_t snd_sem; /* Used to wake up the waiting thread */ - off_t snd_foffset; /* Input file offset */ - size_t snd_flen; /* File length */ - ssize_t snd_sent; /* The number of bytes sent */ - uint32_t snd_isn; /* Initial sequence number */ - uint32_t snd_acked; /* The number of bytes acked */ -#ifdef CONFIG_NET_SOCKOPTS - systime_t snd_time; /* Last send time for determining timeout */ -#endif -}; - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -/**************************************************************************** - * Function: sendfile_timeout - * - * Description: - * Check for send timeout. - * - * Parameters: - * pstate send state structure - * - * Returned Value: - * TRUE:timeout FALSE:no timeout - * - * Assumptions: - * Running at the interrupt level - * - ****************************************************************************/ - -#ifdef CONFIG_NET_SOCKOPTS -static inline int sendfile_timeout(FAR struct sendfile_s *pstate) -{ - FAR struct socket *psock = 0; - - /* Check for a timeout configured via setsockopts(SO_SNDTIMEO). - * If none... we well let the send wait forever. - */ - - psock = pstate->snd_sock; - if (psock && psock->s_sndtimeo != 0) { - /* Check if the configured timeout has elapsed */ - - return net_timeo(pstate->snd_time, psock->s_sndtimeo); - } - - /* No timeout */ - - return FALSE; -} -#endif /* CONFIG_NET_SOCKOPTS */ - -static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, FAR void *pvpriv, uint16_t flags) -{ - FAR struct sendfile_s *pstate = (FAR struct sendfile_s *)pvpriv; - - nllvdbg("flags: %04x\n", flags); - - if ((flags & TCP_ACKDATA) != 0) { - FAR struct tcp_hdr_s *tcp; - -#ifdef CONFIG_NET_SOCKOPTS - /* Update the timeout */ - - pstate->snd_time = clock_systimer(); -#endif - - /* Get the offset address of the TCP header */ - -#ifdef CONFIG_NET_IPv6 -#ifdef CONFIG_NET_IPv4 - if (IFF_IS_IPv6(dev->d_flags)) -#endif - { - DEBUGASSERT(pstate->snd_sock == PF_INET6); - tcp = TCPIPv6BUF; - } -#endif /* CONFIG_NET_IPv6 */ - -#ifdef CONFIG_NET_IPv4 -#ifdef CONFIG_NET_IPv6 - else -#endif - { - DEBUGASSERT(pstate->snd_sock == PF_INET); - tcp = TCPIPv4BUF; - } -#endif /* CONFIG_NET_IPv4 */ - - /* The current acknowledgement number number is the (relative) offset - * of the of the next byte needed by the receiver. The snd_isn is the - * offset of the first byte to send to the receiver. The difference - * is the number of bytes to be acknowledged. - */ - - pstate->snd_acked = tcp_getsequence(TCPBUF->ackno) - pstate->snd_isn; - nllvdbg("ACK: acked=%d sent=%d flen=%d\n", pstate->snd_acked, pstate->snd_sent, pstate->snd_flen); - - dev->d_sndlen = 0; - - flags &= ~TCP_ACKDATA; - } else if ((flags & TCP_REXMIT) != 0) { - nlldbg("REXMIT\n"); - - /* Yes.. in this case, reset the number of bytes that have been sent - * to the number of bytes that have been ACKed. - */ - - pstate->snd_sent = pstate->snd_acked; - } - - /* Check for a loss of connection */ - - else if ((flags & (TCP_CLOSE | TCP_ABORT | TCP_TIMEDOUT)) != 0) { - /* Report not connected */ - - nlldbg("Lost connection\n"); - - net_lostconnection(pstate->snd_sock, flags); - pstate->snd_sent = -ENOTCONN; - } - - /* Wake up the waiting thread */ - - sem_post(&pstate->snd_sem); - - return flags; -} - -/**************************************************************************** - * Function: sendfile_addrcheck - * - * Description: - * Check if the destination IP address is in the IPv4 ARP or IPv6 Neighbor - * tables. If not, then the send won't actually make it out... it will be - * replaced with an ARP request (IPv4) or a Neighbor Solicitation (IPv6). - * - * NOTE 1: This could be an expensive check if there are a lot of - * entries in the ARP or Neighbor tables. - * - * NOTE 2: If we are actually harvesting IP addresses on incoming IP - * packets, then this check should not be necessary; the MAC mapping - * should already be in the ARP table in many cases (IPv4 only). - * - * NOTE 3: If CONFIG_NET_ARP_SEND then we can be assured that the IP - * address mapping is already in the ARP table. - * - * Parameters: - * conn - The TCP connection structure - * - * Returned Value: - * None - * - * Assumptions: - * Running at the interrupt level - * - ****************************************************************************/ - -#ifdef CONFIG_NET_ETHERNET -static inline bool sendfile_addrcheck(FAR struct tcp_conn_s *conn) -{ -#ifdef CONFIG_NET_IPv4 -#ifdef CONFIG_NET_IPv6 - if (conn->domain == PF_INET) -#endif - { -#if !defined(CONFIG_NET_ARP_IPIN) && !defined(CONFIG_NET_ARP_SEND) - return (arp_find(conn->u.ipv4.raddr) != NULL); -#else - return true; -#endif - } -#endif /* CONFIG_NET_IPv4 */ - -#ifdef CONFIG_NET_IPv6 -#ifdef CONFIG_NET_IPv4 - else -#endif - { -#if !defined(CONFIG_NET_ICMPv6_NEIGHBOR) - return (neighbor_findentry(conn->u.ipv6.raddr) != NULL); -#else - return true; -#endif - } -#endif /* CONFIG_NET_IPv6 */ -} - -#else /* CONFIG_NET_ETHERNET */ -#sendfile_addrcheck(r) (true) -#endif /* CONFIG_NET_ETHERNET */ - -/**************************************************************************** - * Function: sendfile_interrupt - * - * Description: - * This function is called from the interrupt level to perform the actual - * send operation when polled by the lower, device interfacing layer. - * - * Parameters: - * dev The structure of the network driver that caused the interrupt - * conn The connection structure associated with the socket - * flags Set of events describing why the callback was invoked - * - * Returned Value: - * None - * - * Assumptions: - * Running at the interrupt level - * - ****************************************************************************/ - -static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, FAR void *pvpriv, uint16_t flags) -{ - FAR struct tcp_conn_s *conn = (FAR struct tcp_conn_s *)pvconn; - FAR struct sendfile_s *pstate = (FAR struct sendfile_s *)pvpriv; - int ret; - - nllvdbg("flags: %04x acked: %d sent: %d\n", flags, pstate->snd_acked, pstate->snd_sent); - - /* Check for a loss of connection */ - - if ((flags & (TCP_CLOSE | TCP_ABORT | TCP_TIMEDOUT)) != 0) { - /* Report not connected */ - - nlldbg("Lost connection\n"); - - net_lostconnection(pstate->snd_sock, flags); - pstate->snd_sent = -ENOTCONN; - goto end_wait; - } - - /* We get here if (1) not all of the data has been ACKed, (2) we have been - * asked to retransmit data, (3) the connection is still healthy, and (4) - * the outgoing packet is available for our use. In this case, we are - * now free to send more data to receiver -- UNLESS the buffer contains - * unprocessing incoming data. In that event, we will have to wait for the - * next polling cycle. - */ - - if ((flags & TCP_NEWDATA) == 0 && pstate->snd_sent < pstate->snd_flen) { - /* Get the amount of data that we can send in the next packet */ - - uint32_t sndlen = pstate->snd_flen - pstate->snd_sent; - - if (sndlen > tcp_mss(conn)) - sndlen = tcp_mss(conn); - - /* Check if we have "space" in the window */ - - if ((pstate->snd_sent - pstate->snd_acked + sndlen) < conn->winsize) { - uint32_t seqno; - - /* Then set-up to send that amount of data. (this won't actually - * happen until the polling cycle completes). - */ - - ret = file_seek(pstate->snd_file, pstate->snd_foffset + pstate->snd_sent, SEEK_SET); - if (ret < 0) { - int errcode = errno; - nlldbg("failed to lseek: %d\n", errcode); - pstate->snd_sent = -errcode; - goto end_wait; - } - - ret = file_read(pstate->snd_file, dev->d_appdata, sndlen); - if (ret < 0) { - int errcode = errno; - nlldbg("failed to read from input file: %d\n", errcode); - pstate->snd_sent = -errcode; - goto end_wait; - } - - dev->d_sndlen = sndlen; - - /* Set the sequence number for this packet. NOTE: uIP updates - * sndseq on recept of ACK *before* this function is called. In that - * case sndseq will point to the next unacknowledge byte (which might - * have already been sent). We will overwrite the value of sndseq - * here before the packet is sent. - */ - - seqno = pstate->snd_sent + pstate->snd_isn; - nllvdbg("SEND: sndseq %08x->%08x len: %d\n", conn->sndseq, seqno, ret); - - tcp_setsequence(conn->sndseq, seqno); - - /* Check if the destination IP address is in the ARP or Neighbor - * table. If not, then the send won't actually make it out... it - * will be replaced with an ARP request or Neighbor Solicitation. - */ - - if (pstate->snd_sent != 0 || sendfile_addrcheck(conn)) { - /* Update the amount of data sent (but not necessarily ACKed) */ - - pstate->snd_sent += sndlen; - nllvdbg("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(), pstate->snd_acked, pstate->snd_sent, pstate->snd_flen); - } - } else { - nlldbg("Window full, wait for ack\n"); - goto wait; - } - } -#ifdef CONFIG_NET_SOCKOPTS - /* All data has been send and we are just waiting for ACK or re-transmit - * indications to complete the send. Check for a timeout. - */ - - if (sendfile_timeout(pstate)) { - /* Yes.. report the timeout */ - - nlldbg("SEND timeout\n"); - pstate->snd_sent = -ETIMEDOUT; - goto end_wait; - } -#endif /* CONFIG_NET_SOCKOPTS */ - - if (pstate->snd_sent >= pstate->snd_flen && pstate->snd_acked < pstate->snd_flen) { - /* All data has been sent, but there are outstanding ACK's */ - - goto wait; - } - -end_wait: - - /* Do not allow any further callbacks */ - - pstate->snd_datacb->flags = 0; - pstate->snd_datacb->priv = NULL; - pstate->snd_datacb->event = NULL; - - /* Wake up the waiting thread */ - - sem_post(&pstate->snd_sem); - -wait: - return flags; -} - -/**************************************************************************** - * Function: sendfile_txnotify - * - * Description: - * Notify the appropriate device driver that we are have data ready to - * be send (TCP) - * - * Parameters: - * psock - Socket state structure - * conn - The TCP connection structure - * - * Returned Value: - * None - * - ****************************************************************************/ - -static inline void sendfile_txnotify(FAR struct socket *psock, FAR struct tcp_conn_s *conn) -{ -#ifdef CONFIG_NET_IPv4 -#ifdef CONFIG_NET_IPv6 - /* If both IPv4 and IPv6 support are enabled, then we will need to select - * the device driver using the appropriate IP domain. - */ - - if (psock->s_domain == PF_INET) -#endif - { - /* Notify the device driver that send data is available */ - -#ifdef CONFIG_NETDEV_MULTINIC - netdev_ipv4_txnotify(conn->u.ipv4.laddr, conn->u.ipv4.raddr); -#else - netdev_ipv4_txnotify(conn->u.ipv4.raddr); -#endif - } -#endif /* CONFIG_NET_IPv4 */ - -#ifdef CONFIG_NET_IPv6 -#ifdef CONFIG_NET_IPv4 - else /* if (psock->s_domain == PF_INET6) */ -#endif /* CONFIG_NET_IPv4 */ - { - /* Notify the device driver that send data is available */ - - DEBUGASSERT(psock->s_domain == PF_INET6); -#ifdef CONFIG_NETDEV_MULTINIC - netdev_ipv6_txnotify(conn->u.ipv6.laddr, conn->u.ipv6.raddr); -#else - netdev_ipv6_txnotify(conn->u.ipv6.raddr); -#endif - } -#endif /* CONFIG_NET_IPv6 */ -} - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Function: net_sendfile - * - * Description: - * The send() call may be used only when the socket is in a connected state - * (so that the intended recipient is known). The only difference between - * send() and write() is the presence of flags. With zero flags parameter, - * send() is equivalent to write(). Also, send(sockfd,buf,len,flags) is - * equivalent to sendto(sockfd,buf,len,flags,NULL,0). - * - * Parameters: - * psock An instance of the internal socket structure. - * buf Data to send - * len Length of data to send - * flags Send flags - * - * Returned Value: - * On success, returns the number of characters sent. On error, - * -1 is returned, and errno is set appropriately: - * - * EAGAIN or EWOULDBLOCK - * The socket is marked non-blocking and the requested operation - * would block. - * EBADF - * An invalid descriptor was specified. - * ECONNRESET - * Connection reset by peer. - * EDESTADDRREQ - * The socket is not connection-mode, and no peer address is set. - * EFAULT - * An invalid user space address was specified for a parameter. - * EINTR - * A signal occurred before any data was transmitted. - * EINVAL - * Invalid argument passed. - * EISCONN - * The connection-mode socket was connected already but a recipient - * was specified. (Now either this error is returned, or the recipient - * specification is ignored.) - * EMSGSIZE - * The socket type requires that message be sent atomically, and the - * size of the message to be sent made this impossible. - * ENOBUFS - * The output queue for a network interface was full. This generally - * indicates that the interface has stopped sending, but may be - * caused by transient congestion. - * ENOMEM - * No memory available. - * ENOTCONN - * The socket is not connected, and no target has been given. - * ENOTSOCK - * The argument s is not a socket. - * EOPNOTSUPP - * Some bit in the flags argument is inappropriate for the socket - * type. - * EPIPE - * The local end has been shut down on a connection oriented socket. - * In this case the process will also receive a SIGPIPE unless - * MSG_NOSIGNAL is set. - * - * Assumptions: - * - ****************************************************************************/ - -ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset, size_t count) -{ - FAR struct socket *psock = sockfd_socket(outfd); - FAR struct tcp_conn_s *conn; - struct sendfile_s state; - net_lock_t save; - int err; - - /* Verify that the sockfd corresponds to valid, allocated socket */ - - if (!psock || psock->s_crefs <= 0) { - ndbg("ERROR: Invalid socket\n"); - err = EBADF; - goto errout; - } - - /* If this is an un-connected socket, then return ENOTCONN */ - - if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags)) { - ndbg("ERROR: Not connected\n"); - err = ENOTCONN; - goto errout; - } - - /* Make sure that we have the IP address mapping */ - - conn = (FAR struct tcp_conn_s *)psock->s_conn; - DEBUGASSERT(conn); - -#if defined(CONFIG_NET_ARP_SEND) || defined(CONFIG_NET_ICMPv6_NEIGHBOR) -#ifdef CONFIG_NET_ARP_SEND -#ifdef CONFIG_NET_ICMPv6_NEIGHBOR - if (psock->s_domain == PF_INET) -#endif - { - /* Make sure that the IP address mapping is in the ARP table */ - - ret = arp_send(conn->u.ipv4.raddr); - } -#endif /* CONFIG_NET_ARP_SEND */ - -#ifdef CONFIG_NET_ICMPv6_NEIGHBOR -#ifdef CONFIG_NET_ARP_SEND - else -#endif - { - /* Make sure that the IP address mapping is in the Neighbor Table */ - - ret = icmpv6_neighbor(conn->u.ipv6.raddr); - } -#endif /* CONFIG_NET_ICMPv6_NEIGHBOR */ - - /* Did we successfully get the address mapping? */ - - if (ret < 0) { - ndbg("ERROR: Not reachable\n"); - err = ENETUNREACH; - goto errout; - } -#endif /* CONFIG_NET_ARP_SEND || CONFIG_NET_ICMPv6_NEIGHBOR */ - - /* Set the socket state to sending */ - - psock->s_flags = _SS_SETSTATE(psock->s_flags, _SF_SEND); - - /* Initialize the state structure. This is done with interrupts - * disabled because we don't want anything to happen until we - * are ready. - */ - - save = net_lock(); - - memset(&state, 0, sizeof(struct sendfile_s)); - sem_init(&state.snd_sem, 0, 0); /* Doesn't really fail */ - state.snd_sock = psock; /* Socket descriptor to use */ - state.snd_foffset = offset ? *offset : 0; /* Input file offset */ - state.snd_flen = count; /* Number of bytes to send */ - state.snd_file = infile; /* File to read from */ - - /* Allocate resources to receive a callback */ - - state.snd_datacb = tcp_callback_alloc(conn); - - if (state.snd_datacb == NULL) { - nlldbg("Failed to allocate data callback\n"); - err = ENOMEM; - goto errout_locked; - } - - state.snd_ackcb = tcp_callback_alloc(conn); - - if (state.snd_ackcb == NULL) { - nlldbg("Failed to allocate ack callback\n"); - err = ENOMEM; - goto errout_datacb; - } - - /* Get the initial sequence number that will be used */ - - state.snd_isn = tcp_getsequence(conn->sndseq); - - /* There is no outstanding, unacknowledged data after this - * initial sequence number. - */ - - conn->unacked = 0; - -#ifdef CONFIG_NET_SOCKOPTS - /* Set the initial time for calculating timeouts */ - - state.snd_time = clock_systimer(); -#endif - - /* Set up the ACK callback in the connection */ - - state.snd_ackcb->flags = (TCP_ACKDATA | TCP_REXMIT | TCP_CLOSE | TCP_ABORT | TCP_TIMEDOUT); - state.snd_ackcb->priv = (void *)&state; - state.snd_ackcb->event = ack_interrupt; - - /* Perform the TCP send operation */ - - do { - state.snd_datacb->flags = TCP_POLL; - state.snd_datacb->priv = (void *)&state; - state.snd_datacb->event = sendfile_interrupt; - - /* Notify the device driver of the availability of TX data */ - - sendfile_txnotify(psock, conn); - net_lockedwait(&state.snd_sem); - } while (state.snd_sent >= 0 && state.snd_acked < state.snd_flen); - - /* Set the socket state to idle */ - - psock->s_flags = _SS_SETSTATE(psock->s_flags, _SF_IDLE); - - tcp_callback_free(conn, state.snd_ackcb); - -errout_datacb: - tcp_callback_free(conn, state.snd_datacb); - -errout_locked: - - sem_destroy(&state.snd_sem); - net_unlock(save); - -errout: - - if (err) { - set_errno(err); - return ERROR; - } else if (state.snd_sent < 0) { - set_errno(-state.snd_sent); - return ERROR; - } else { - return state.snd_sent; - } -} - -#endif /* CONFIG_NET && CONFIG_NET_TCP */ - -#endif diff --git a/os/syscall/syscall.csv b/os/syscall/syscall.csv index 3eaaafd..2774aa9 100644 --- a/os/syscall/syscall.csv +++ b/os/syscall/syscall.csv @@ -118,7 +118,6 @@ "sem_unlink", "semaphore.h", "defined(CONFIG_FS_NAMED_SEMAPHORES)", "int", "FAR const char*" "sem_wait", "semaphore.h", "", "int", "FAR sem_t*" "send", "sys/socket.h", "CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)", "ssize_t", "int", "FAR const void*", "size_t", "int" -"sendfile", "sys/sendfile.h", "CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_NET_SENDFILE)", "ssize_t", "int", "int", "FAR off_t*", "size_t" "sendto", "sys/socket.h", "CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)", "ssize_t", "int", "FAR const void*", "size_t", "int", "FAR const struct sockaddr*", "socklen_t" "set_errno", "errno.h", "", "void", "int" "setenv", "stdlib.h", "!defined(CONFIG_DISABLE_ENVIRON)", "int", "const char*", "const char*", "int" diff --git a/os/syscall/syscall_lookup.h b/os/syscall/syscall_lookup.h index bbd7802..313bc67 100644 --- a/os/syscall/syscall_lookup.h +++ b/os/syscall/syscall_lookup.h @@ -219,9 +219,6 @@ SYSCALL_LOOKUP(fdopen, 3, STUB_fs_fdopen) SYSCALL_LOOKUP(sched_getstreams, 0, STUB_sched_getstreams) # endif -# if defined(CONFIG_NET_SENDFILE) -SYSCALL_LOOKUP(sendfile, 4, STUB_fs_sendifile) -# endif # if !defined(CONFIG_DISABLE_MOUNTPOINT) SYSCALL_LOOKUP(fsync, 1, STUB_fsync) -- 2.7.4