sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/local: Fix minor issues found in code reading

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2024-02-28 13:14:19 +08:00 committed by Alan Carvalho de Assis
parent 2f4e90b1e9
commit 155768bae3
14 changed files with 51 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/local/local.h
View File

@ -88,7 +88,7 @@ enum local_state_s
* connection structures: * connection structures:
* *
* 1. Server. A SOCK_STREAM that only listens for and accepts * 1. Server. A SOCK_STREAM that only listens for and accepts
* connections from server. * connections from client.
* 2. Client. A SOCK_STREAM peer that connects via the server. * 2. Client. A SOCK_STREAM peer that connects via the server.
* 3. Peer. A connected SOCK_STREAM that sends() and recvs() packets. * 3. Peer. A connected SOCK_STREAM that sends() and recvs() packets.
* May either be the client that connect with the server of the * May either be the client that connect with the server of the
@ -98,8 +98,7 @@ enum local_state_s
* And * And
* *
* 4. Connectionless. Like a peer but using a connectionless datagram * 4. Connectionless. Like a peer but using a connectionless datagram
* style of communication. SOCK_DRAM support has not yet been * style of communication.
* implemented.
*/ */
struct devif_callback_s; /* Forward reference */ struct devif_callback_s; /* Forward reference */

12
net/local/local_accept.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL_STREAM)
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
@ -99,7 +98,7 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
FAR socklen_t *addrlen, FAR struct socket *newsock, FAR socklen_t *addrlen, FAR struct socket *newsock,
int flags) int flags)
{ {
FAR struct local_conn_s *server; FAR struct local_conn_s *server = psock->s_conn;
FAR struct local_conn_s *conn; FAR struct local_conn_s *conn;
FAR dq_entry_t *waiter; FAR dq_entry_t *waiter;
bool nonblock = !!(flags & SOCK_NONBLOCK); bool nonblock = !!(flags & SOCK_NONBLOCK);
@ -116,12 +115,6 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
/* Verify that a valid memory block has been provided to receive the
* address
*/
server = psock->s_conn;
if (server->lc_proto != SOCK_STREAM || if (server->lc_proto != SOCK_STREAM ||
server->lc_state != LOCAL_STATE_LISTENING) server->lc_state != LOCAL_STATE_LISTENING)
{ {
@ -137,7 +130,6 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
*/ */
waiter = dq_remfirst(&server->u.server.lc_waiters); waiter = dq_remfirst(&server->u.server.lc_waiters);
if (waiter) if (waiter)
{ {
conn = container_of(waiter, struct local_conn_s, conn = container_of(waiter, struct local_conn_s,
@ -192,5 +184,3 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
} }
} }
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL_STREAM */

9
net/local/local_bind.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
#include <sys/socket.h> #include <sys/socket.h>
#include <string.h> #include <string.h>
@ -38,7 +37,7 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: local_bind * Name: psock_local_bind
* *
* Description: * Description:
* This function implements the low-level parts of the standard local * This function implements the low-level parts of the standard local
@ -49,7 +48,7 @@
int psock_local_bind(FAR struct socket *psock, int psock_local_bind(FAR struct socket *psock,
FAR const struct sockaddr *addr, socklen_t addrlen) FAR const struct sockaddr *addr, socklen_t addrlen)
{ {
FAR struct local_conn_s *conn; FAR struct local_conn_s *conn = psock->s_conn;
FAR const struct sockaddr_un *unaddr = FAR const struct sockaddr_un *unaddr =
(FAR const struct sockaddr_un *)addr; (FAR const struct sockaddr_un *)addr;
@ -60,8 +59,6 @@ int psock_local_bind(FAR struct socket *psock,
return -EINVAL; return -EINVAL;
} }
conn = psock->s_conn;
/* Save the address family */ /* Save the address family */
conn->lc_proto = psock->s_type; conn->lc_proto = psock->s_type;
@ -95,5 +92,3 @@ int psock_local_bind(FAR struct socket *psock,
conn->lc_state = LOCAL_STATE_BOUND; conn->lc_state = LOCAL_STATE_BOUND;
return OK; return OK;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

3
net/local/local_conn.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
@ -347,5 +346,3 @@ void local_subref(FAR struct local_conn_s *conn)
local_release(conn); local_release(conn);
} }
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

22
net/local/local_connect.c
View File

@ -40,8 +40,6 @@
#include "socket/socket.h" #include "socket/socket.h"
#include "local/local.h" #include "local/local.h"
#ifdef CONFIG_NET_LOCAL_STREAM
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -94,7 +92,6 @@ static int inline local_stream_connect(FAR struct local_conn_s *client,
{ {
nerr("ERROR: Failed to create FIFOs for %s: %d\n", nerr("ERROR: Failed to create FIFOs for %s: %d\n",
client->lc_path, ret); client->lc_path, ret);
return ret; return ret;
} }
@ -107,7 +104,6 @@ static int inline local_stream_connect(FAR struct local_conn_s *client,
{ {
nerr("ERROR: Failed to open write-only FIFOs for %s: %d\n", nerr("ERROR: Failed to open write-only FIFOs for %s: %d\n",
client->lc_path, ret); client->lc_path, ret);
goto errout_with_fifos; goto errout_with_fifos;
} }
@ -118,7 +114,6 @@ static int inline local_stream_connect(FAR struct local_conn_s *client,
{ {
nerr("ERROR: Failed to alloc accept conn %s: %d\n", nerr("ERROR: Failed to alloc accept conn %s: %d\n",
client->lc_path, ret); client->lc_path, ret);
goto errout_with_outfd; goto errout_with_outfd;
} }
@ -129,9 +124,8 @@ static int inline local_stream_connect(FAR struct local_conn_s *client,
ret = local_open_client_rx(client, nonblock); ret = local_open_client_rx(client, nonblock);
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: Failed to open write-only FIFOs for %s: %d\n", nerr("ERROR: Failed to open read-only FIFOs for %s: %d\n",
client->lc_path, ret); client->lc_path, ret);
goto errout_with_conn; goto errout_with_conn;
} }
@ -220,15 +214,13 @@ int32_t local_generate_instance_id(void)
int psock_local_connect(FAR struct socket *psock, int psock_local_connect(FAR struct socket *psock,
FAR const struct sockaddr *addr) FAR const struct sockaddr *addr)
{ {
FAR struct local_conn_s *client; FAR struct local_conn_s *client = psock->s_conn;
FAR struct sockaddr_un *unaddr = (FAR struct sockaddr_un *)addr; FAR struct sockaddr_un *unaddr = (FAR struct sockaddr_un *)addr;
FAR const char *unpath = unaddr->sun_path; FAR const char *unpath = unaddr->sun_path;
FAR struct local_conn_s *conn = NULL; FAR struct local_conn_s *conn = NULL;
uint8_t type = LOCAL_TYPE_PATHNAME; uint8_t type = LOCAL_TYPE_PATHNAME;
struct stat buf; struct stat buf;
int ret; int ret = OK;
client = psock->s_conn;
if (client->lc_state == LOCAL_STATE_ACCEPT || if (client->lc_state == LOCAL_STATE_ACCEPT ||
client->lc_state == LOCAL_STATE_CONNECTED) client->lc_state == LOCAL_STATE_CONNECTED)
@ -247,9 +239,9 @@ int psock_local_connect(FAR struct socket *psock,
net_lock(); net_lock();
while ((conn = local_nextconn(conn)) != NULL) while ((conn = local_nextconn(conn)) != NULL)
{ {
/* Slef found, continue */ /* Self found, continue */
if (conn == psock->s_conn) if (conn == client)
{ {
continue; continue;
} }
@ -272,8 +264,6 @@ int psock_local_connect(FAR struct socket *psock,
conn->lc_type == type && conn->lc_proto == SOCK_STREAM && conn->lc_type == type && conn->lc_proto == SOCK_STREAM &&
strncmp(conn->lc_path, unpath, UNIX_PATH_MAX - 1) == 0) strncmp(conn->lc_path, unpath, UNIX_PATH_MAX - 1) == 0)
{ {
ret = OK;
/* Bind the address and protocol */ /* Bind the address and protocol */
client->lc_type = conn->lc_type; client->lc_type = conn->lc_type;
@ -307,5 +297,3 @@ int psock_local_connect(FAR struct socket *psock,
ret = nx_stat(unpath, &buf, 1); ret = nx_stat(unpath, &buf, 1);
return ret < 0 ? ret : -ECONNREFUSED; return ret < 0 ? ret : -ECONNREFUSED;
} }
#endif /* CONFIG_NET_LOCAL_STREAM */

24
net/local/local_fifo.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -156,7 +155,7 @@ static bool local_fifo_exists(FAR const char *path)
* In that case, we will return false and mkfifo() will fail. * In that case, we will return false and mkfifo() will fail.
*/ */
return (bool)S_ISFIFO(buf.st_mode); return S_ISFIFO(buf.st_mode);
} }
/**************************************************************************** /****************************************************************************
@ -478,12 +477,12 @@ int local_release_fifos(FAR struct local_conn_s *conn)
int ret1; int ret1;
int ret2; int ret2;
/* Destroy the client-to-server FIFO if it exists. */ /* Destroy the server-to-client FIFO if it exists. */
local_sc_name(conn, path); local_sc_name(conn, path);
ret1 = local_release_fifo(path); ret1 = local_release_fifo(path);
/* Destroy the server-to-client FIFO if it exists. */ /* Destroy the client-to-server FIFO if it exists. */
local_cs_name(conn, path); local_cs_name(conn, path);
ret2 = local_release_fifo(path); ret2 = local_release_fifo(path);
@ -610,7 +609,7 @@ int local_open_server_rx(FAR struct local_conn_s *server, bool nonblock)
local_cs_name(server, path); local_cs_name(server, path);
/* Then open the file for write-only access */ /* Then open the file for read-only access */
ret = local_rx_open(server, path, nonblock); ret = local_rx_open(server, path, nonblock);
if (ret == OK) if (ret == OK)
@ -627,7 +626,7 @@ int local_open_server_rx(FAR struct local_conn_s *server, bool nonblock)
* Name: local_open_server_tx * Name: local_open_server_tx
* *
* Description: * Description:
* Only the server-side of the server-to-client FIFO. * Open the server-side of the server-to-client FIFO.
* *
****************************************************************************/ ****************************************************************************/
@ -640,7 +639,7 @@ int local_open_server_tx(FAR struct local_conn_s *server, bool nonblock)
local_sc_name(server, path); local_sc_name(server, path);
/* Then open the file for read-only access */ /* Then open the file for write-only access */
ret = local_tx_open(server, path, nonblock); ret = local_tx_open(server, path, nonblock);
if (ret == OK) if (ret == OK)
@ -657,7 +656,7 @@ int local_open_server_tx(FAR struct local_conn_s *server, bool nonblock)
* Name: local_open_receiver * Name: local_open_receiver
* *
* Description: * Description:
* Only the receiving side of the half duplex FIFO. * Open the receiving side of the half duplex FIFO.
* *
****************************************************************************/ ****************************************************************************/
@ -679,7 +678,6 @@ int local_open_receiver(FAR struct local_conn_s *conn, bool nonblock)
/* Policy: Free FIFO resources when the buffer is empty. */ /* Policy: Free FIFO resources when the buffer is empty. */
ret = local_set_policy(&conn->lc_infile, 1); ret = local_set_policy(&conn->lc_infile, 1);
if (ret == 0) if (ret == 0)
{ {
/* Set POLLOUT threshold bigger than preamble len. /* Set POLLOUT threshold bigger than preamble len.
@ -700,7 +698,7 @@ int local_open_receiver(FAR struct local_conn_s *conn, bool nonblock)
* Name: local_open_sender * Name: local_open_sender
* *
* Description: * Description:
* Only the sending side of the half duplex FIFO. * Open the sending side of the half duplex FIFO.
* *
****************************************************************************/ ****************************************************************************/
@ -715,7 +713,7 @@ int local_open_sender(FAR struct local_conn_s *conn, FAR const char *path,
local_hd_name(path, fullpath); local_hd_name(path, fullpath);
/* Then open the file for read-only access */ /* Then open the file for write-only access */
ret = local_tx_open(conn, fullpath, nonblock); ret = local_tx_open(conn, fullpath, nonblock);
if (ret == OK) if (ret == OK)
@ -726,7 +724,7 @@ int local_open_sender(FAR struct local_conn_s *conn, FAR const char *path,
if (ret == 0) if (ret == 0)
{ {
/* Set POLLIN threshold bigger than preamble len. /* Set POLLIN threshold bigger than preamble len.
* This is to avoid non-blocking read failed with -EAGAIN when * This is to avoid non-blocking write failed with -EAGAIN when
* only preamble len is sent and read by reader. * only preamble len is sent and read by reader.
*/ */
@ -764,5 +762,3 @@ int local_set_nonblocking(FAR struct local_conn_s *conn)
return ret; return ret;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

7
net/local/local_listen.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL_STREAM)
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
@ -66,7 +65,7 @@
int local_listen(FAR struct socket *psock, int backlog) int local_listen(FAR struct socket *psock, int backlog)
{ {
FAR struct local_conn_s *server; FAR struct local_conn_s *server = psock->s_conn;
/* Verify that the sockfd corresponds to a connected SOCK_STREAM in this /* Verify that the sockfd corresponds to a connected SOCK_STREAM in this
* address family. * address family.
@ -81,8 +80,6 @@ int local_listen(FAR struct socket *psock, int backlog)
net_lock(); net_lock();
server = psock->s_conn;
/* Some sanity checks */ /* Some sanity checks */
if (server->lc_proto != SOCK_STREAM || if (server->lc_proto != SOCK_STREAM ||
@ -119,5 +116,3 @@ int local_listen(FAR struct socket *psock, int backlog)
return OK; return OK;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL_STREAM */

17
net/local/local_netpoll.c
View File

@ -47,7 +47,6 @@ static int local_event_pollsetup(FAR struct local_conn_s *conn,
bool setup) bool setup)
{ {
pollevent_t eventset; pollevent_t eventset;
int ret = OK;
int i; int i;
if (setup) if (setup)
@ -108,7 +107,7 @@ static int local_event_pollsetup(FAR struct local_conn_s *conn,
nxmutex_unlock(&conn->lc_polllock); nxmutex_unlock(&conn->lc_polllock);
} }
return ret; return OK;
} }
/**************************************************************************** /****************************************************************************
@ -121,7 +120,6 @@ static void local_inout_poll_cb(FAR struct pollfd *fds)
poll_notify(&originfds, 1, fds->revents); poll_notify(&originfds, 1, fds->revents);
} }
#endif #endif
/**************************************************************************** /****************************************************************************
@ -160,14 +158,12 @@ void local_event_pollnotify(FAR struct local_conn_s *conn,
int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds) int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
{ {
FAR struct local_conn_s *conn; FAR struct local_conn_s *conn = psock->s_conn;
int ret = -ENOSYS; int ret = OK;
conn = psock->s_conn;
if (conn->lc_proto == SOCK_DGRAM) if (conn->lc_proto == SOCK_DGRAM)
{ {
return ret; return -ENOSYS;
} }
#ifdef CONFIG_NET_LOCAL_STREAM #ifdef CONFIG_NET_LOCAL_STREAM
@ -280,7 +276,6 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
break; break;
default: default:
ret = OK;
break; break;
} }
#endif #endif
@ -312,11 +307,9 @@ pollerr:
int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds) int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
{ {
FAR struct local_conn_s *conn; FAR struct local_conn_s *conn = psock->s_conn;
int ret = OK; int ret = OK;
conn = psock->s_conn;
if (conn->lc_proto == SOCK_DGRAM) if (conn->lc_proto == SOCK_DGRAM)
{ {
return -ENOSYS; return -ENOSYS;

6
net/local/local_recvmsg.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
@ -374,7 +373,6 @@ psock_dgram_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
if (conn->pktlen <= 0) if (conn->pktlen <= 0)
{ {
ret = local_sync(&conn->lc_infile); ret = local_sync(&conn->lc_infile);
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: Failed to get packet length: %d\n", ret); nerr("ERROR: Failed to get packet length: %d\n", ret);
@ -473,7 +471,7 @@ errout_with_halfduplex:
return ret < 0 ? ret : readlen; return ret < 0 ? ret : readlen;
} }
#endif /* CONFIG_NET_LOCAL_STREAM */ #endif /* CONFIG_NET_LOCAL_DGRAM */
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -549,5 +547,3 @@ ssize_t local_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
return len; return len;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

8
net/local/local_recvutils.c
View File

@ -36,8 +36,6 @@
#include "local/local.h" #include "local/local.h"
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -190,8 +188,8 @@ int local_getaddr(FAR struct local_conn_s *conn, FAR struct sockaddr *addr,
if (totlen > *addrlen) if (totlen > *addrlen)
{ {
pathlen -= (totlen - *addrlen); pathlen -= (totlen - *addrlen);
totlen = *addrlen; totlen = *addrlen;
} }
/* Copy the Unix domain address */ /* Copy the Unix domain address */
@ -206,5 +204,3 @@ int local_getaddr(FAR struct local_conn_s *conn, FAR struct sockaddr *addr,
*addrlen = totlen; *addrlen = totlen;
return OK; return OK;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

5
net/local/local_release.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
@ -78,7 +77,7 @@ int local_release(FAR struct local_conn_s *conn)
/* Are there still clients waiting for a connection to the server? */ /* Are there still clients waiting for a connection to the server? */
for (waiter = dq_peek(&conn->u.server.lc_waiters); for (waiter = dq_peek(&conn->u.server.lc_waiters);
waiter; waiter != NULL;
waiter = dq_next(&accept->u.accept.lc_waiter)) waiter = dq_next(&accept->u.accept.lc_waiter))
{ {
accept = container_of(waiter, struct local_conn_s, accept = container_of(waiter, struct local_conn_s,
@ -100,5 +99,3 @@ int local_release(FAR struct local_conn_s *conn)
net_unlock(); net_unlock();
return OK; return OK;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

16
net/local/local_sendmsg.c
View File

@ -23,7 +23,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -178,18 +177,17 @@ static ssize_t local_send(FAR struct socket *psock,
case SOCK_DGRAM: case SOCK_DGRAM:
#endif /* CONFIG_NET_LOCAL_DGRAM */ #endif /* CONFIG_NET_LOCAL_DGRAM */
{ {
FAR struct local_conn_s *peer; FAR struct local_conn_s *conn = psock->s_conn;
/* Local TCP packet send */ /* Local TCP packet send */
DEBUGASSERT(buf); DEBUGASSERT(buf);
peer = psock->s_conn;
/* Verify that this is a connected peer socket and that it has /* Verify that this is a connected peer socket and that it has
* opened the outgoing FIFO for write-only access. * opened the outgoing FIFO for write-only access.
*/ */
if (peer->lc_state != LOCAL_STATE_CONNECTED) if (conn->lc_state != LOCAL_STATE_CONNECTED)
{ {
nerr("ERROR: not connected\n"); nerr("ERROR: not connected\n");
return -ENOTCONN; return -ENOTCONN;
@ -197,14 +195,14 @@ static ssize_t local_send(FAR struct socket *psock,
/* Check shutdown state */ /* Check shutdown state */
if (peer->lc_outfile.f_inode == NULL) if (conn->lc_outfile.f_inode == NULL)
{ {
return -EPIPE; return -EPIPE;
} }
/* Send the packet */ /* Send the packet */
ret = nxmutex_lock(&peer->lc_sendlock); ret = nxmutex_lock(&conn->lc_sendlock);
if (ret < 0) if (ret < 0)
{ {
/* May fail because the task was canceled. */ /* May fail because the task was canceled. */
@ -212,9 +210,9 @@ static ssize_t local_send(FAR struct socket *psock,
return ret; return ret;
} }
ret = local_send_packet(&peer->lc_outfile, buf, len, ret = local_send_packet(&conn->lc_outfile, buf, len,
psock->s_type == SOCK_DGRAM); psock->s_type == SOCK_DGRAM);
nxmutex_unlock(&peer->lc_sendlock); nxmutex_unlock(&conn->lc_sendlock);
} }
break; break;
default: default:
@ -433,5 +431,3 @@ ssize_t local_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
return len; return len;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

4
net/local/local_sendpacket.c
View File

@ -36,8 +36,6 @@
#include "local/local.h" #include "local/local.h"
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -164,5 +162,3 @@ int local_send_packet(FAR struct file *filep, FAR const struct iovec *buf,
return len16 > 0 ? len16 : ret; return len16 > 0 ? len16 : ret;
} }
#endif /* CONFIG_NET && CONFIG_NET_LOCAL */

55
net/local/local_sockif.c
View File

@ -41,8 +41,6 @@
#include "local/local.h" #include "local/local.h"
#ifdef CONFIG_NET_LOCAL
/**************************************************************************** /****************************************************************************
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
@ -126,7 +124,6 @@ const struct sock_intf_s g_local_sockif =
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_NET_LOCAL_STREAM) || defined(CONFIG_NET_LOCAL_DGRAM)
static int local_sockif_alloc(FAR struct socket *psock) static int local_sockif_alloc(FAR struct socket *psock)
{ {
/* Allocate the local connection structure */ /* Allocate the local connection structure */
@ -144,7 +141,6 @@ static int local_sockif_alloc(FAR struct socket *psock)
psock->s_conn = conn; psock->s_conn = conn;
return OK; return OK;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: local_setup * Name: local_setup
@ -200,7 +196,6 @@ static int local_setup(FAR struct socket *psock)
return local_sockif_alloc(psock); return local_sockif_alloc(psock);
#endif /* CONFIG_NET_LOCAL_DGRAM */ #endif /* CONFIG_NET_LOCAL_DGRAM */
#if defined(CONFIG_NET_LOCAL_STREAM) || defined(CONFIG_NET_LOCAL_DGRAM)
case SOCK_CTRL: case SOCK_CTRL:
if (psock->s_proto == 0 || psock->s_proto == IPPROTO_TCP || if (psock->s_proto == 0 || psock->s_proto == IPPROTO_TCP ||
psock->s_proto == IPPROTO_UDP) psock->s_proto == IPPROTO_UDP)
@ -211,7 +206,6 @@ static int local_setup(FAR struct socket *psock)
} }
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
#endif
default: default:
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
@ -286,7 +280,7 @@ static int local_bind(FAR struct socket *psock,
/* Verify that a valid address has been provided */ /* Verify that a valid address has been provided */
if (addr->sa_family != AF_LOCAL || addrlen < sizeof(sa_family_t)) if (addrlen < sizeof(sa_family_t) || addr->sa_family != AF_LOCAL)
{ {
nerr("ERROR: Invalid address length: %d < %zu\n", nerr("ERROR: Invalid address length: %d < %zu\n",
addrlen, sizeof(sa_family_t)); addrlen, sizeof(sa_family_t));
@ -299,7 +293,6 @@ static int local_bind(FAR struct socket *psock,
{ {
/* Bind a local TCP/IP stream or datagram socket */ /* Bind a local TCP/IP stream or datagram socket */
#if defined(CONFIG_NET_LOCAL_STREAM) || defined(CONFIG_NET_LOCAL_DGRAM)
#ifdef CONFIG_NET_LOCAL_STREAM #ifdef CONFIG_NET_LOCAL_STREAM
case SOCK_STREAM: case SOCK_STREAM:
#endif #endif
@ -313,7 +306,6 @@ static int local_bind(FAR struct socket *psock,
ret = psock_local_bind(psock, addr, addrlen); ret = psock_local_bind(psock, addr, addrlen);
} }
break; break;
#endif /* CONFIG_NET_LOCAL_STREAM || CONFIG_NET_LOCAL_DGRAM */
default: default:
ret = -EBADF; ret = -EBADF;
@ -356,7 +348,7 @@ static int local_getsockname(FAR struct socket *psock,
FAR socklen_t *addrlen) FAR socklen_t *addrlen)
{ {
FAR struct sockaddr_un *unaddr = (FAR struct sockaddr_un *)addr; FAR struct sockaddr_un *unaddr = (FAR struct sockaddr_un *)addr;
FAR struct local_conn_s *conn; FAR struct local_conn_s *conn = psock->s_conn;
if (*addrlen < sizeof(sa_family_t)) if (*addrlen < sizeof(sa_family_t))
{ {
@ -366,8 +358,6 @@ static int local_getsockname(FAR struct socket *psock,
return OK; return OK;
} }
conn = psock->s_conn;
/* Save the address family */ /* Save the address family */
unaddr->sun_family = AF_LOCAL; unaddr->sun_family = AF_LOCAL;
@ -377,11 +367,11 @@ static int local_getsockname(FAR struct socket *psock,
if (conn->lc_type == LOCAL_TYPE_UNNAMED) if (conn->lc_type == LOCAL_TYPE_UNNAMED)
{ {
/* Zero-length sun_path... This is an abstract Unix domain socket */ /* Zero-length sun_path... */
*addrlen = sizeof(sa_family_t); *addrlen = sizeof(sa_family_t);
} }
else /* conn->lc_type = LOCAL_TYPE_PATHNAME */ else
{ {
/* Get the full length of the socket name (incl. null terminator) */ /* Get the full length of the socket name (incl. null terminator) */
@ -451,8 +441,8 @@ static int local_getpeername(FAR struct socket *psock,
FAR socklen_t *addrlen) FAR socklen_t *addrlen)
{ {
FAR struct sockaddr_un *unaddr = (FAR struct sockaddr_un *)addr; FAR struct sockaddr_un *unaddr = (FAR struct sockaddr_un *)addr;
FAR struct local_conn_s *conn; FAR struct local_conn_s *conn = psock->s_conn;
FAR struct local_conn_s *peer; FAR struct local_conn_s *peer = conn->lc_peer;
if (*addrlen < sizeof(sa_family_t)) if (*addrlen < sizeof(sa_family_t))
{ {
@ -464,15 +454,11 @@ static int local_getpeername(FAR struct socket *psock,
/* Verify that the socket has been connected */ /* Verify that the socket has been connected */
conn = psock->s_conn;
if (conn->lc_state != LOCAL_STATE_CONNECTED) if (conn->lc_state != LOCAL_STATE_CONNECTED)
{ {
return -ENOTCONN; return -ENOTCONN;
} }
peer = conn->lc_peer;
/* Save the address family */ /* Save the address family */
unaddr->sun_family = AF_LOCAL; unaddr->sun_family = AF_LOCAL;
@ -482,11 +468,11 @@ static int local_getpeername(FAR struct socket *psock,
if (peer->lc_type == LOCAL_TYPE_UNNAMED) if (peer->lc_type == LOCAL_TYPE_UNNAMED)
{ {
/* Zero-length sun_path... This is an abstract Unix domain socket */ /* Zero-length sun_path... */
*addrlen = sizeof(sa_family_t); *addrlen = sizeof(sa_family_t);
} }
else /* conn->lc_type = LOCAL_TYPE_PATHNAME */ else
{ {
/* Get the full length of the socket name (incl. null terminator) */ /* Get the full length of the socket name (incl. null terminator) */
@ -509,13 +495,11 @@ static int local_getpeername(FAR struct socket *psock,
if (peer->lc_type == LOCAL_TYPE_ABSTRACT) if (peer->lc_type == LOCAL_TYPE_ABSTRACT)
{ {
unaddr->sun_path[0] = '\0'; unaddr->sun_path[0] = '\0';
strlcpy(&unaddr->sun_path[1], strlcpy(&unaddr->sun_path[1], peer->lc_path, namelen - 1);
peer->lc_path, namelen - 1);
} }
else else
{ {
strlcpy(unaddr->sun_path, strlcpy(unaddr->sun_path, peer->lc_path, namelen);
peer->lc_path, namelen);
} }
*addrlen = sizeof(sa_family_t) + namelen; *addrlen = sizeof(sa_family_t) + namelen;
@ -693,20 +677,16 @@ static int local_connect(FAR struct socket *psock,
{ {
/* Perform the datagram connection logic */ /* Perform the datagram connection logic */
/* #warning Missing logic */
return -ENOSYS; return -ENOSYS;
} }
break; break;
#endif /* CONFIG_NET_LOCAL_DGRAM */ #endif /* CONFIG_NET_LOCAL_DGRAM */
#if defined(CONFIG_NET_LOCAL_STREAM) || defined(CONFIG_NET_LOCAL_DGRAM)
case SOCK_CTRL: case SOCK_CTRL:
{ {
return -ENOSYS; return -ENOSYS;
} }
break; break;
#endif
default: default:
return -EBADF; return -EBADF;
@ -772,7 +752,6 @@ static int local_close(FAR struct socket *psock)
switch (psock->s_type) switch (psock->s_type)
{ {
#if defined(CONFIG_NET_LOCAL_STREAM) || defined(CONFIG_NET_LOCAL_DGRAM)
#ifdef CONFIG_NET_LOCAL_STREAM #ifdef CONFIG_NET_LOCAL_STREAM
case SOCK_STREAM: case SOCK_STREAM:
#endif #endif
@ -786,10 +765,8 @@ static int local_close(FAR struct socket *psock)
*/ */
local_subref(psock->s_conn); local_subref(psock->s_conn);
return OK; return OK;
} }
#endif /* CONFIG_NET_LOCAL_STREAM || CONFIG_NET_LOCAL_DGRAM */
default: default:
return -EBADF; return -EBADF;
@ -811,11 +788,9 @@ static int local_close(FAR struct socket *psock)
static int local_ioctl(FAR struct socket *psock, int cmd, unsigned long arg) static int local_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
{ {
FAR struct local_conn_s *conn; FAR struct local_conn_s *conn = psock->s_conn;
int ret = OK; int ret = OK;
conn = psock->s_conn;
switch (cmd) switch (cmd)
{ {
case FIONBIO: case FIONBIO:
@ -972,6 +947,10 @@ static int local_socketpair(FAR struct socket *psocks[2])
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
ret = local_set_pollthreshold(conns[i], sizeof(uint16_t)); ret = local_set_pollthreshold(conns[i], sizeof(uint16_t));
if (ret < 0)
{
goto errout;
}
} }
} }
#endif #endif
@ -1039,10 +1018,8 @@ static int local_shutdown(FAR struct socket *psock, int how)
case SOCK_DGRAM: case SOCK_DGRAM:
return -EOPNOTSUPP; return -EOPNOTSUPP;
#endif #endif
#if defined(CONFIG_NET_LOCAL_STREAM) || defined(CONFIG_NET_LOCAL_DGRAM)
case SOCK_CTRL: case SOCK_CTRL:
return -EOPNOTSUPP; return -EOPNOTSUPP;
#endif
default: default:
return -EBADF; return -EBADF;
} }
@ -1051,5 +1028,3 @@ static int local_shutdown(FAR struct socket *psock, int how)
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
#endif /* CONFIG_NET_LOCAL */