[nuttx] branch master updated: arch/sim: Support more sockopts on native socket

[pkarashchenko]

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

pkarashchenko 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 f2690837e7 arch/sim: Support more sockopts on native socket
f2690837e7 is described below

commit f2690837e7bed7fac75e5b12524ba8d48b2e73ca
Author: Zhe Weng <weng...@xiaomi.com>
AuthorDate: Tue Jun 13 17:33:30 2023 +0800

    arch/sim: Support more sockopts on native socket
    
    Signed-off-by: Zhe Weng <weng...@xiaomi.com>
---
 arch/sim/src/sim/posix/sim_hostusrsock.c | 79 ++++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 10 deletions(-)

diff --git a/arch/sim/src/sim/posix/sim_hostusrsock.c 
b/arch/sim/src/sim/posix/sim_hostusrsock.c
index b809d45088..3ebe530d9e 100644
--- a/arch/sim/src/sim/posix/sim_hostusrsock.c
+++ b/arch/sim/src/sim/posix/sim_hostusrsock.c
@@ -38,6 +38,7 @@
 
 #include <netinet/in.h>
 
+#include "sim_internal.h"
 #include "sim_hostusrsock.h"
 
 /****************************************************************************
@@ -123,6 +124,72 @@ static void sock_nonblock(int socket, int enable)
     }
 }
 
+static int optname_to_native(int optname)
+{
+  switch (optname)
+    {
+      case NUTTX_SO_ACCEPTCONN:
+        return SO_ACCEPTCONN;
+
+      case NUTTX_SO_BROADCAST:
+        return SO_BROADCAST;
+
+      case NUTTX_SO_DEBUG:
+        return SO_DEBUG;
+
+      case NUTTX_SO_DONTROUTE:
+        return SO_DONTROUTE;
+
+      case NUTTX_SO_ERROR:
+        return SO_ERROR;
+
+      case NUTTX_SO_KEEPALIVE:
+        return SO_KEEPALIVE;
+
+      case NUTTX_SO_LINGER:
+        return SO_LINGER;
+
+      case NUTTX_SO_OOBINLINE:
+        return SO_OOBINLINE;
+
+      case NUTTX_SO_RCVBUF:
+        return SO_RCVBUF;
+
+      case NUTTX_SO_RCVLOWAT:
+        return SO_RCVLOWAT;
+
+      case NUTTX_SO_RCVTIMEO:
+        return SO_RCVTIMEO;
+
+      case NUTTX_SO_REUSEADDR:
+        return SO_REUSEADDR;
+
+      case NUTTX_SO_SNDBUF:
+        return SO_SNDBUF;
+
+      case NUTTX_SO_SNDLOWAT:
+        return SO_SNDLOWAT;
+
+      case NUTTX_SO_SNDTIMEO:
+        return SO_SNDTIMEO;
+
+      case NUTTX_SO_TYPE:
+        return SO_TYPE;
+
+      case NUTTX_SO_TIMESTAMP:
+        return SO_TIMESTAMP;
+
+#ifdef CONFIG_HOST_LINUX
+      case NUTTX_SO_BINDTODEVICE:
+        return SO_BINDTODEVICE;
+#endif
+
+      default:
+        syslog(LOG_ERR, "Invalid optname: %x\n", optname);
+        return -1;
+    }
+}
+
 static int host_usrsock_sockopt(int sockfd, int level, int optname,
                                 const void *optval, nuttx_socklen_t *optlen,
                                 bool set)
@@ -150,17 +217,9 @@ static int host_usrsock_sockopt(int sockfd, int level, int 
optname,
       return ret;
     }
 
-  if (optname == NUTTX_SO_REUSEADDR)
-    {
-      optname = SO_REUSEADDR;
-    }
-  else if (optname == NUTTX_SO_ERROR)
-    {
-      optname = SO_ERROR;
-    }
-  else
+  optname = optname_to_native(optname);
+  if (optname < 0)
     {
-      syslog(LOG_ERR, "Invalid optname: %x\n", optname);
       return ret;
     }