From commits-return-6736-archive-asf-public=cust-asf.ponee.io@nuttx.apache.org Wed Apr 8 14:21:39 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 60D1C180671 for ; Wed, 8 Apr 2020 16:21:39 +0200 (CEST) Received: (qmail 31213 invoked by uid 500); 8 Apr 2020 14:21:33 -0000 Mailing-List: contact commits-help@nuttx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nuttx.apache.org Delivered-To: mailing list commits@nuttx.apache.org Received: (qmail 30542 invoked by uid 99); 8 Apr 2020 14:21:32 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2020 14:21:32 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 352CE8B69E; Wed, 8 Apr 2020 14:21:32 +0000 (UTC) Date: Wed, 08 Apr 2020 14:21:48 +0000 To: "commits@nuttx.apache.org" Subject: [incubator-nuttx] 18/31: Added support for SO_TIMESTAMP in socketlayer and SocketCAN Cleanup FlexCAN driver driver Disabled workqueue based TX in FlexCAN MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: gnutt@apache.org In-Reply-To: <158635569027.4740.17276242767012299828@gitbox.apache.org> References: <158635569027.4740.17276242767012299828@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-nuttx X-Git-Refname: refs/heads/SocketCAN X-Git-Reftype: branch X-Git-Rev: 2f4489031fdaef740073f7c43f09eea702191ec2 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200408142132.352CE8B69E@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. gnutt pushed a commit to branch SocketCAN in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 2f4489031fdaef740073f7c43f09eea702191ec2 Author: Peter van der Perk AuthorDate: Wed Mar 11 14:32:52 2020 +0100 Added support for SO_TIMESTAMP in socketlayer and SocketCAN Cleanup FlexCAN driver driver Disabled workqueue based TX in FlexCAN --- net/socket/recvmsg.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 238 insertions(+) diff --git a/net/socket/recvmsg.c b/net/socket/recvmsg.c new file mode 100644 index 0000000..17d4dfe --- /dev/null +++ b/net/socket/recvmsg.c @@ -0,0 +1,238 @@ +/**************************************************************************** + * net/socket/recvmsg.c + * + * Copyright (C) 2007-2009, 2011-2017, 2019 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 "socket/socket.h" + +#ifdef CONFIG_NET_RECVMSG_CMSG + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: psock_recvmsg + * + * Description: + * psock_recvfrom() receives messages from a socket, and may be used to + * receive data on a socket whether or not it is connection-oriented. + * This is an internal OS interface. It is functionally equivalent to + * recvfrom() except that: + * + * - It is not a cancellation point, + * - It does not modify the errno variable, and + * - I accepts the internal socket structure as an input rather than an + * task-specific socket descriptor. + * + * Input Parameters: + * psock - A pointer to a NuttX-specific, internal socket structure + * msg Buffer to receive msg + * len - Length of buffer + * flags - Receive flags + * + * Returned Value: + * On success, returns the number of characters sent. If no data is + * available to be received and the peer has performed an orderly shutdown, + * recv() will return 0. Otherwise, on any failure, a negated errno value + * is returned (see comments with send() for a list of appropriate errno + * values). + * + ****************************************************************************/ + +ssize_t psock_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg, + int flags) +{ + /* Verify that non-NULL pointers were passed */ + if (msg == NULL) + { + return -EINVAL; + } + + if (msg->msg_iovlen != 1) + { + return -ENOTSUP; + } + + /* Verify that the sockfd corresponds to valid, allocated socket */ + + if (psock == NULL || psock->s_crefs <= 0) + { + return -EBADF; + } + + /* Let logic specific to this address family handle the recvfrom() + * operation. + */ + + DEBUGASSERT(psock->s_sockif != NULL && + (psock->s_sockif->si_recvmsg != NULL || + psock->s_sockif->si_recvfrom != NULL)); + + if(psock->s_sockif->si_recvmsg != NULL) + { + return psock->s_sockif->si_recvmsg(psock, msg, flags); + } + else + { + /* Socket doesn't implement si_recvmsg fallback to si_recvfrom */ + FAR void *buf = msg->msg_iov->iov_base; + FAR struct sockaddr *from = msg->msg_name; + FAR socklen_t *fromlen = (FAR socklen_t *)&msg->msg_namelen; + size_t len = msg->msg_iov->iov_len; + return psock->s_sockif->si_recvfrom(psock, buf, len, flags, from, fromlen); + } + +} + +/**************************************************************************** + * Name: nx_recvfrom + * + * Description: + * nx_recvfrom() receives messages from a socket, and may be used to + * receive data on a socket whether or not it is connection-oriented. + * This is an internal OS interface. It is functionally equivalent to + * recvfrom() except that: + * + * - It is not a cancellation point, and + * - It does not modify the errno variable. + * + * Input Parameters: + * sockfd - Socket descriptor of socket + * msg Buffer to receive msg + * len - Length of buffer + * flags - Receive flags + * + * Returned Value: + * On success, returns the number of characters sent. If no data is + * available to be received and the peer has performed an orderly shutdown, + * recv() will return 0. Otherwise, on any failure, a negated errno value + * is returned (see comments with send() for a list of appropriate errno + * values). + * + ****************************************************************************/ + +ssize_t nx_recvmsg(int sockfd, FAR struct msghdr *msg, int flags) +{ + FAR struct socket *psock; + + /* Get the underlying socket structure */ + + psock = sockfd_socket(sockfd); + + /* Then let psock_recvmsg() do all of the work */ + + return psock_recvmsg(psock, msg, flags); +} + +/**************************************************************************** + * Function: recvmsg + * + * Description: + * The recvmsg() call is identical to recvfrom() with a NULL from parameter. + * + * Parameters: + * sockfd Socket descriptor of socket + * msg Buffer to receive msg + * len Length of buffer + * flags Receive flags + * + * Returned Value: + * On success, returns the number of characters received. On error, + * -1 is returned, and errno is set appropriately: + * + * EAGAIN + * The socket is marked non-blocking and the receive operation would block, + * or a receive timeout had been set and the timeout expired before data + * was received. + * EBADF + * The argument sockfd is an invalid descriptor. + * ECONNREFUSED + * A remote host refused to allow the network connection (typically because + * it is not running the requested service). + * EFAULT + * The receive buffer pointer(s) point outside the process's address space. + * EINTR + * The receive was interrupted by delivery of a signal before any data were + * available. + * EINVAL + * Invalid argument passed. + * ENOMEM + * Could not allocate memory. + * ENOTCONN + * The socket is associated with a connection-oriented protocol and has + * not been connected. + * ENOTSOCK + * The argument sockfd does not refer to a socket. + * + ****************************************************************************/ + +ssize_t recvmsg(int sockfd, FAR struct msghdr *msg, int flags) +{ + FAR struct socket *psock; + ssize_t ret; + + /* recvfrom() is a cancellation point */ + + enter_cancellation_point(); + + /* Get the underlying socket structure */ + + psock = sockfd_socket(sockfd); + + /* Let psock_recvfrom() do all of the work */ + + ret = psock_recvmsg(psock, msg, flags); + if (ret < 0) + { + _SO_SETERRNO(psock, -ret); + ret = ERROR; + } + + leave_cancellation_point(); + return ret; +} + +#endif /* CONFIG_NET_RECVMSG_CMSG */