diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-02 15:05:48 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-02 15:05:48 +0000 |
commit | 971830b005e76311a0950d26f6862997c892e76a (patch) | |
tree | 599f441faca90309ec3f48698ba5491b0a7017c7 /nuttx/net | |
parent | 6f39c643ac7af0880f49f7673307053db11218e9 (diff) | |
download | px4-nuttx-971830b005e76311a0950d26f6862997c892e76a.tar.gz px4-nuttx-971830b005e76311a0950d26f6862997c892e76a.tar.bz2 px4-nuttx-971830b005e76311a0950d26f6862997c892e76a.zip |
Add support so that fdopen() may be used on socket descriptors
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3659 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
-rw-r--r-- | nuttx/net/Makefile | 31 | ||||
-rw-r--r-- | nuttx/net/connect.c | 7 | ||||
-rw-r--r-- | nuttx/net/net_checksd.c | 88 | ||||
-rw-r--r-- | nuttx/net/send.c | 2 |
4 files changed, 113 insertions, 15 deletions
diff --git a/nuttx/net/Makefile b/nuttx/net/Makefile index d252b036f..94af9e0d2 100644 --- a/nuttx/net/Makefile +++ b/nuttx/net/Makefile @@ -36,27 +36,42 @@ -include $(TOPDIR)/Make.defs ifeq ($(CONFIG_NET),y) -SOCK_ASRCS = -SOCK_CSRCS = bind.c connect.c getsockname.c recv.c recvfrom.c socket.c \ + +# Basic networking support + +SOCK_ASRCS = +SOCK_CSRCS = bind.c connect.c getsockname.c recv.c recvfrom.c socket.c \ sendto.c net_sockets.c net_close.c net_dup.c net_dup2.c net_clone.c \ net_vfcntl.c +# TCP/IP support + ifeq ($(CONFIG_NET_TCP),y) -SOCK_CSRCS += send.c listen.c accept.c +SOCK_CSRCS += send.c listen.c accept.c endif +# Socket options + ifeq ($(CONFIG_NET_SOCKOPTS),y) -SOCK_CSRCS += setsockopt.c getsockopt.c +SOCK_CSRCS += setsockopt.c getsockopt.c ifneq ($(CONFIG_DISABLE_CLOCK),y) -SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c +SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c ifneq ($(CONFIG_NET_SLIP),y) -SOCK_CSRCS += net_arptimer.c +SOCK_CSRCS += net_arptimer.c endif endif endif -NETDEV_ASRCS = -NETDEV_CSRCS = netdev_register.c netdev_ioctl.c net_poll.c netdev_txnotify.c \ +# Support for network access using streams + +ifneq ($(CONFIG_NFILE_STREAMS),0) +SOCK_CSRCS += net_checksd.c +endif + +# Support for operations on network devices + +NETDEV_ASRCS = +NETDEV_CSRCS = netdev_register.c netdev_ioctl.c net_poll.c netdev_txnotify.c \ netdev_findbyname.c netdev_findbyaddr.c netdev_count.c \ netdev_foreach.c netdev_unregister.c diff --git a/nuttx/net/connect.c b/nuttx/net/connect.c index ae4518ad0..f6006e3e6 100644 --- a/nuttx/net/connect.c +++ b/nuttx/net/connect.c @@ -372,12 +372,7 @@ static inline int tcp_connect(FAR struct socket *psock, const struct sockaddr_in if (ret < 0) { - int err = errno; - if (err >= 0) - { - err = ENOSYS; - } - ret = -err; + ret = -errno; } else { diff --git a/nuttx/net/net_checksd.c b/nuttx/net/net_checksd.c new file mode 100644 index 000000000..76d30fbee --- /dev/null +++ b/nuttx/net/net_checksd.c @@ -0,0 +1,88 @@ +/**************************************************************************** + * net/net_checksd.c + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/socket.h> + +#include <sched.h> +#include <errno.h> +#include <debug.h> + +#include "net_internal.h" + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: net_checksd + * + * Description: + * Check if the socket descriptor is valid for the provided TCB and if it + * supports the requested access. This trivial operation is part of the + * fdopen() operation when the fdopen() is performed on a socket descriptor. + * It simply performs some sanity checking before permitting the socket + * descriptor to be wrapped as a C FILE stream. + * + ****************************************************************************/ + +#if defined(CONFIG_NET) && CONFIG_NFILE_DESCRIPTORS > 0 +int net_checksd(FAR _TCB *tcb, int sd, int oflags) +{ + FAR struct socket *psock = sockfd_socket(sd); + + /* Verify that the sockfd corresponds to valid, allocated socket */ + + if (!psock || psock->s_crefs <= 0) + { + nvdbg("No valid socket for sd: %d\n", sd); + return -EBADF; + } + + /* NOTE: We permit the socket FD to be "wrapped" in a stream as + * soon as the socket descriptor is created by socket(). Therefore + * (1) we don't care if the socket is connected yet, and (2) there + * are no access restrictions that can be enforced yet. + */ + + return OK; +} +#endif /* CONIG_NET && ONFIG_NFILE_DESCRIPTORS > 0 */ + diff --git a/nuttx/net/send.c b/nuttx/net/send.c index ffa689996..0b2f3739c 100644 --- a/nuttx/net/send.c +++ b/nuttx/net/send.c @@ -415,7 +415,7 @@ ssize_t send(int sockfd, const void *buf, size_t len, int flags) goto errout; } - /* If this is a connected socket, then return ENOTCONN */ + /* If this is an un-connected socket, then return ENOTCONN */ if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags)) { |