[nuttx] branch master updated: net/local: Support `SO_SNDBUF` option in `getsockopt`

[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 9ef2a48919 net/local: Support `SO_SNDBUF` option in `getsockopt`
9ef2a48919 is described below

commit 9ef2a489191a0cb665085a6f7fb79ed96ebb0a1f
Author: Zhe Weng <weng...@xiaomi.com>
AuthorDate: Tue Oct 24 17:41:14 2023 +0800

    net/local: Support `SO_SNDBUF` option in `getsockopt`
    
    For datagram unix sockets, the `SO_SNDBUF` value imposes an upper limit on 
the size of outgoing datagrams.
    
    Note: We don't support to change the buffer size yet, so only add support 
to getsockopt now.
    Refs: https://man7.org/linux/man-pages/man7/unix.7.html
    
    Signed-off-by: Zhe Weng <weng...@xiaomi.com>
---
 net/local/local.h            |  2 ++
 net/local/local_sendpacket.c |  2 +-
 net/local/local_sockif.c     | 35 ++++++++++++++++++++++++++---------
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/net/local/local.h b/net/local/local.h
index 8804c783e1..411d45b8f9 100644
--- a/net/local/local.h
+++ b/net/local/local.h
@@ -49,6 +49,8 @@
 #define LOCAL_NPOLLWAITERS 2
 #define LOCAL_NCONTROLFDS  4
 
+#define LOCAL_SEND_LIMIT   (CONFIG_DEV_FIFO_SIZE - sizeof(uint16_t))
+
 /****************************************************************************
  * Public Type Definitions
  ****************************************************************************/
diff --git a/net/local/local_sendpacket.c b/net/local/local_sendpacket.c
index f941dc0de0..a922a05520 100644
--- a/net/local/local_sendpacket.c
+++ b/net/local/local_sendpacket.c
@@ -130,7 +130,7 @@ int local_send_packet(FAR struct file *filep, FAR const 
struct iovec *buf,
           len16 += iov->iov_len;
         }
 
-      if (len16 > CONFIG_DEV_FIFO_SIZE - sizeof(uint16_t))
+      if (len16 > LOCAL_SEND_LIMIT)
         {
           nerr("ERROR: Packet is too big: %d\n", len16);
           return -EMSGSIZE;
diff --git a/net/local/local_sockif.c b/net/local/local_sockif.c
index 77b5abb55e..93035ee0ab 100644
--- a/net/local/local_sockif.c
+++ b/net/local/local_sockif.c
@@ -562,20 +562,37 @@ static int local_getsockopt(FAR struct socket *psock, int 
level, int option,
 {
   DEBUGASSERT(psock->s_domain == PF_LOCAL);
 
-#ifdef CONFIG_NET_LOCAL_SCM
-  if (level == SOL_SOCKET && option == SO_PEERCRED)
+  if (level == SOL_SOCKET)
     {
-      FAR struct local_conn_s *conn = psock->s_conn;
-      if (*value_len != sizeof(struct ucred))
+      switch (option)
         {
-          return -EINVAL;
-        }
+#ifdef CONFIG_NET_LOCAL_SCM
+          case SO_PEERCRED:
+            {
+              FAR struct local_conn_s *conn = psock->s_conn;
+              if (*value_len != sizeof(struct ucred))
+                {
+                  return -EINVAL;
+                }
 
-      memcpy(value, &conn->lc_peer->lc_cred, sizeof(struct ucred));
-      return OK;
-    }
+              memcpy(value, &conn->lc_peer->lc_cred, sizeof(struct ucred));
+              return OK;
+            }
 #endif
 
+          case SO_SNDBUF:
+            {
+              if (*value_len != sizeof(int))
+                {
+                  return -EINVAL;
+                }
+
+              *(FAR int *)value = LOCAL_SEND_LIMIT;
+              return OK;
+            }
+        }
+    }
+
   return -ENOPROTOOPT;
 }