Skip to content

Commit

Permalink
socketpair.c:Replace kmm with fs heap
Browse files Browse the repository at this point in the history
due to https://github.com/apache/nuttx/pull/13722/commits, In the socketpair.c,fs_heap interface replaces kmm interface

Signed-off-by: wangchen <[email protected]>
  • Loading branch information
wangchen61698 authored and GUIDINGLI committed Oct 16, 2024
1 parent c59c6b0 commit addfe12
Show file tree
Hide file tree
Showing 4 changed files with 141 additions and 98 deletions.
2 changes: 1 addition & 1 deletion fs/socket/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
#
# ##############################################################################
if(CONFIG_NET)
target_sources(fs PRIVATE socket.c accept.c)
target_sources(fs PRIVATE socket.c accept.c socketpair.c)
endif()
2 changes: 1 addition & 1 deletion fs/socket/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

ifeq ($(CONFIG_NET),y)

CSRCS += socket.c accept.c
CSRCS += socket.c accept.c socketpair.c

# Include socket build support

Expand Down
139 changes: 139 additions & 0 deletions fs/socket/socketpair.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
/****************************************************************************
* fs/socket/socketpair.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"
#include "fs_heap.h"

/****************************************************************************
* Public Functions
****************************************************************************/

/****************************************************************************
* Name: socketpair
*
* Description:
* Create an unbound pair of connected sockets in a specified domain, of a
* specified type, under the protocol optionally specified by the protocol
* argument. The two sockets shall be identical. The file descriptors used
* in referencing the created sockets shall be returned in
* sv[0] and sv[1].
*
* Input Parameters:
* domain - (see sys/socket.h)
* type - (see sys/socket.h)
* protocol - (see sys/socket.h)
* sv[2] - The user provided array in which to catch the pair
* descriptors
*
****************************************************************************/

int socketpair(int domain, int type, int protocol, int sv[2])
{
FAR struct socket *psocks[2];
int oflags = O_RDWR;
int ret;
int i;
int j = 0;
int k;

if (sv == NULL)
{
ret = -EINVAL;
goto errout;
}

for (k = 0; k < 2; k++)
{
psocks[k] = fs_heap_zalloc(sizeof(*psocks[k]));
if (psocks[k] == NULL)
{
ret = -ENOMEM;
goto errout_with_alloc;
}
}

ret = psock_socketpair(domain, type, protocol, psocks);
if (ret < 0)
{
goto errout_with_alloc;
}

if (type & SOCK_CLOEXEC)
{
oflags |= O_CLOEXEC;
}

if (type & SOCK_NONBLOCK)
{
oflags |= O_NONBLOCK;
}

/* Allocate a socket descriptor */

for (; j < 2; j++)
{
sv[j] = sockfd_allocate(psocks[j], oflags);
if (sv[j] < 0)
{
ret = sv[j];
goto errout_with_psock;
}
}

return OK;

errout_with_psock:
for (i = 0; i < j; i++)
{
nx_close(sv[i]);
}

for (i = j; i < k; i++)
{
psock_close(psocks[i]);
}

errout_with_alloc:
for (i = j; i < k; i++)
{
fs_heap_free(psocks[i]);
}

errout:
set_errno(-ret);
return ERROR;
}
96 changes: 0 additions & 96 deletions net/socket/socketpair.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,99 +96,3 @@ int psock_socketpair(int domain, int type, int protocol,
psock_close(psocks[0]);
return ret;
}

/****************************************************************************
* Name: socketpair
*
* Description:
* Create an unbound pair of connected sockets in a specified domain, of a
* specified type, under the protocol optionally specified by the protocol
* argument. The two sockets shall be identical. The file descriptors used
* in referencing the created sockets shall be returned in
* sv[0] and sv[1].
*
* Input Parameters:
* domain - (see sys/socket.h)
* type - (see sys/socket.h)
* protocol - (see sys/socket.h)
* sv[2] - The user provided array in which to catch the pair
* descriptors
*
****************************************************************************/

int socketpair(int domain, int type, int protocol, int sv[2])
{
FAR struct socket *psocks[2];
int oflags = O_RDWR;
int ret;
int i;
int j = 0;
int k;

if (sv == NULL)
{
ret = -EINVAL;
goto errout;
}

for (k = 0; k < 2; k++)
{
psocks[k] = kmm_zalloc(sizeof(*psocks[k]));
if (psocks[k] == NULL)
{
ret = -ENOMEM;
goto errout_with_alloc;
}
}

ret = psock_socketpair(domain, type, protocol, psocks);
if (ret < 0)
{
goto errout_with_alloc;
}

if (type & SOCK_CLOEXEC)
{
oflags |= O_CLOEXEC;
}

if (type & SOCK_NONBLOCK)
{
oflags |= O_NONBLOCK;
}

/* Allocate a socket descriptor */

for (; j < 2; j++)
{
sv[j] = sockfd_allocate(psocks[j], oflags);
if (sv[j] < 0)
{
ret = sv[j];
goto errout_with_psock;
}
}

return OK;

errout_with_psock:
for (i = 0; i < j; i++)
{
nx_close(sv[i]);
}

for (i = j; i < k; i++)
{
psock_close(psocks[i]);
}

errout_with_alloc:
for (i = j; i < k; i++)
{
kmm_free(psocks[i]);
}

errout:
set_errno(-ret);
return ERROR;
}

0 comments on commit addfe12

Please sign in to comment.