Donny9 commented on a change in pull request #2899:
URL: https://github.com/apache/incubator-nuttx/pull/2899#discussion_r581655529
##########
File path: net/socket/accept.c
##########
@@ -284,7 +278,7 @@ int accept(int sockfd, FAR struct sockaddr *addr, FAR
socklen_t *addrlen)
return newfd;
errout_with_socket:
- sockfd_release(newfd);
+ close(newfd);
Review comment:
Done.
##########
File path: fs/socket/socket.c
##########
@@ -0,0 +1,298 @@
+/****************************************************************************
+ * fs/socket/socket.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/kmalloc.h>
+#include <nuttx/net/net.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/mm/mm.h>
+
+#include <sys/socket.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <debug.h>
+
+#include "inode/inode.h"
+
+/****************************************************************************
+ * Private Functions Prototypes
+ ****************************************************************************/
+
+static int sock_file_open(FAR struct file *filep);
+static int sock_file_close(FAR struct file *filep);
+static ssize_t sock_file_read(FAR struct file *filep, FAR char *buffer,
+ size_t buflen);
+static ssize_t sock_file_write(FAR struct file *filep,
+ FAR const char *buffer, size_t buflen);
+static int sock_file_ioctl(FAR struct file *filep, int cmd,
+ unsigned long arg);
+static int sock_file_poll(FAR struct file *filep, struct pollfd *fds,
+ bool setup);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct file_operations g_sock_fileops =
+{
+ sock_file_open, /* open */
+ sock_file_close, /* close */
+ sock_file_read, /* read */
+ sock_file_write, /* write */
+ NULL, /* seek */
+ sock_file_ioctl, /* ioctl */
+ sock_file_poll, /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+ NULL, /* unlink */
+#endif
+};
+
+static struct inode g_sock_inode =
+{
+ .i_crefs = 1,
+ .i_flags = FSNODEFLAG_TYPE_SOCKET,
+ .u =
+ {
+ .i_ops = &g_sock_fileops,
+ },
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int sock_file_open(FAR struct file *filep)
+{
+ FAR struct socket *psock;
+ int ret;
+
+ psock = kmm_zalloc(sizeof(*psock));
+ if (psock == NULL)
+ {
+ return -ENOMEM;
+ }
+
+ ret = psock_dup2(filep->f_priv, psock);
+ if (ret >= 0)
+ {
+ filep->f_priv = psock;
+ }
+ else
+ {
+ kmm_free(psock);
+ }
+
+ return ret;
+}
+
+static int sock_file_close(FAR struct file *filep)
+{
+ psock_close(filep->f_priv);
+ kmm_free(filep->f_priv);
+ return 0;
+}
+
+static ssize_t sock_file_read(FAR struct file *filep, FAR char *buffer,
+ size_t buflen)
+{
+ return psock_recv(filep->f_priv, buffer, buflen, 0);
+}
+
+static ssize_t sock_file_write(FAR struct file *filep,
+ FAR const char *buffer, size_t buflen)
+{
+ return psock_send(filep->f_priv, buffer, buflen, 0);
+}
+
+static int sock_file_ioctl(FAR struct file *filep, int cmd,
+ unsigned long arg)
+{
+ return psock_ioctl(filep->f_priv, cmd, arg);
+}
+
+static int sock_file_poll(FAR struct file *filep, FAR struct pollfd *fds,
+ bool setup)
+{
+ return psock_poll(filep->f_priv, fds, setup);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: sockfd_allocate
+ *
+ * Description:
+ * Allocate a socket descriptor
+ *
+ * Input Parameters:
+ * psock A double pointer to socket structure to be allocated.
+ *
+ * Returned Value:
+ * Allocate a struct files instance and associate it with an socket
+ * instance. Returns the file descriptor == index into the files array.
+ *
+ ****************************************************************************/
+
+int sockfd_allocate(FAR struct socket **psock)
+{
+ int sockfd;
+
+ *psock = kmm_zalloc(sizeof(**psock));
+ if (*psock == NULL)
+ {
+ return -ENOMEM;
+ }
+
+ sockfd = files_allocate(&g_sock_inode, O_RDWR, 0, *psock, 0);
+ if (sockfd < 0)
+ {
+ kmm_free(*psock);
+ }
+
+ inode_addref(&g_sock_inode);
+
+ return sockfd;
+}
+
+/****************************************************************************
+ * Name: sockfd_socket
+ *
+ * Description:
+ * Given a socket descriptor, return the underlying socket structure.
+ *
+ * Input Parameters:
+ * sockfd - The socket descriptor index to use.
+ *
+ * Returned Value:
+ * On success, a reference to the socket structure associated with the
+ * the socket descriptor is returned. NULL is returned on any failure.
+ *
+ ****************************************************************************/
+
+FAR struct socket *sockfd_socket(int sockfd)
+{
+ FAR struct file *filep;
+
+ if (fs_getfilep(sockfd, &filep) < 0)
+ {
+ return NULL;
+ }
+
+ if (INODE_IS_SOCKET(filep->f_inode))
+ {
+ return filep->f_priv;
+ }
+
+ return NULL;
+}
+
+/****************************************************************************
+ * Name: socket
+ *
+ * Description:
+ * socket() creates an endpoint for communication and returns a descriptor.
+ *
+ * Input Parameters:
+ * domain (see sys/socket.h)
+ * type (see sys/socket.h)
+ * protocol (see sys/socket.h)
+ *
+ * Returned Value:
+ * A non-negative socket descriptor on success; -1 on error with errno set
+ * appropriately.
+ *
+ * EACCES
+ * Permission to create a socket of the specified type and/or protocol
+ * is denied.
+ * EAFNOSUPPORT
+ * The implementation does not support the specified address family.
+ * EINVAL
+ * Unknown protocol, or protocol family not available.
+ * EMFILE
+ * Process file table overflow.
+ * ENFILE
+ * The system limit on the total number of open files has been reached.
+ * ENOBUFS or ENOMEM
+ * Insufficient memory is available. The socket cannot be created until
+ * sufficient resources are freed.
+ * EPROTONOSUPPORT
+ * The protocol type or the specified protocol is not supported within
+ * this domain.
+ *
+ * Assumptions:
+ *
+ ****************************************************************************/
+
+int socket(int domain, int type, int protocol)
+{
+ FAR struct socket *psock;
+ FAR struct file *filep;
+ int errcode;
+ int sockfd;
+ int ret;
+
+ /* Allocate a socket descriptor */
+
+ sockfd = sockfd_allocate(&psock);
+ if (sockfd < 0)
+ {
+ nerr("ERROR: Failed to allocate a socket descriptor\n");
+ errcode = -sockfd;
+ goto errout;
+ }
+
+ ret = fs_getfilep(sockfd, &filep);
+ if (ret < 0)
+ {
+ goto errout_with_sockfd;
+ }
+
+ if (type & SOCK_CLOEXEC)
+ {
+ filep->f_oflags |= O_CLOEXEC;
+ }
+
+ /* Initialize the socket structure */
+
+ ret = psock_socket(domain, type, protocol, psock);
+ if (ret < 0)
+ {
+ nerr("ERROR: psock_socket() failed: %d\n", ret);
+ errcode = -ret;
+ goto errout_with_sockfd;
+ }
+
+ return sockfd;
+
+errout_with_sockfd:
+ close(sockfd);
Review comment:
Done!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
