(nuttx) branch master updated: local: correct shutdown state when use UDP mode

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 230714bd23d local: correct shutdown state when use UDP mode
230714bd23d is described below

commit 230714bd23d4e3f6da6be6ac86828ce77f35077a
Author: ligd <liguidi...@xiaomi.com>
AuthorDate: Fri Nov 24 20:12:49 2023 +0800

    local: correct shutdown state when use UDP mode
    
    Signed-off-by: ligd <liguidi...@xiaomi.com>
---
 net/local/local_recvmsg.c | 8 --------
 net/local/local_sendmsg.c | 9 +--------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/net/local/local_recvmsg.c b/net/local/local_recvmsg.c
index 7f44907650e..eb95629383b 100644
--- a/net/local/local_recvmsg.c
+++ b/net/local/local_recvmsg.c
@@ -539,19 +539,11 @@ errout_with_halfduplex:
 ssize_t local_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
                       int flags)
 {
-  FAR struct local_conn_s *conn = psock->s_conn;
   FAR socklen_t *fromlen = &msg->msg_namelen;
   FAR struct sockaddr *from = msg->msg_name;
   FAR void *buf = msg->msg_iov->iov_base;
   size_t len = msg->msg_iov->iov_len;
 
-  /* Check shutdown state */
-
-  if (conn->lc_infile.f_inode == NULL)
-    {
-      return 0;
-    }
-
   if (msg->msg_iovlen != 1)
     {
       return -ENOTSUP;
diff --git a/net/local/local_sendmsg.c b/net/local/local_sendmsg.c
index d743ed80d11..32539732983 100644
--- a/net/local/local_sendmsg.c
+++ b/net/local/local_sendmsg.c
@@ -431,20 +431,13 @@ errout_with_lock:
 ssize_t local_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
                       int flags)
 {
-  FAR struct local_conn_s *conn = psock->s_conn;
   FAR const struct sockaddr *to = msg->msg_name;
   FAR const struct iovec *buf = msg->msg_iov;
   socklen_t tolen = msg->msg_namelen;
   size_t len = msg->msg_iovlen;
 
-  /* Check shutdown state */
-
-  if (conn->lc_outfile.f_inode == NULL)
-    {
-      return -EPIPE;
-    }
-
 #ifdef CONFIG_NET_LOCAL_SCM
+  FAR struct local_conn_s *conn = psock->s_conn;
   int count = 0;
 
   if (msg->msg_control &&