[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] linux-user: add missing UDP get/setsockopt option
From: |
Laurent Vivier |
Subject: |
[PULL 2/5] linux-user: add missing UDP get/setsockopt option |
Date: |
Thu, 21 Jan 2021 13:38:49 +0100 |
From: Shu-Chun Weng <scw@google.com>
SOL_UDP manipulate options at UDP level. All six options currently defined
in linux source include/uapi/linux/udp.h take integer values.
Signed-off-by: Shu-Chun Weng <scw@google.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20201218193213.3566856-3-scw@google.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/strace.c | 6 ++++++
linux-user/syscall.c | 7 +++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 227812c07e63..64172de99d98 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -7,6 +7,7 @@
#include <sys/mount.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
+#include <netinet/udp.h>
#include <linux/if_packet.h>
#include <linux/netlink.h>
#include <sched.h>
@@ -2644,6 +2645,11 @@ static void do_print_sockopt(const char *name, abi_long
arg1)
print_raw_param(TARGET_ABI_FMT_ld, optname, 0);
print_pointer(optval, 0);
break;
+ case SOL_UDP:
+ qemu_log("SOL_UDP,");
+ print_raw_param(TARGET_ABI_FMT_ld, optname, 0);
+ print_pointer(optval, 0);
+ break;
case SOL_IP:
qemu_log("SOL_IP,");
print_raw_param(TARGET_ABI_FMT_ld, optname, 0);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 98aaca01872f..969db2008104 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -53,6 +53,7 @@
//#include <sys/user.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
+#include <netinet/udp.h>
#include <linux/wireless.h>
#include <linux/icmp.h>
#include <linux/icmpv6.h>
@@ -2184,7 +2185,8 @@ static abi_long do_setsockopt(int sockfd, int level, int
optname,
switch(level) {
case SOL_TCP:
- /* TCP options all take an 'int' value. */
+ case SOL_UDP:
+ /* TCP and UDP options all take an 'int' value. */
if (optlen < sizeof(uint32_t))
return -TARGET_EINVAL;
@@ -2832,7 +2834,8 @@ get_timeout:
}
break;
case SOL_TCP:
- /* TCP options all take an 'int' value. */
+ case SOL_UDP:
+ /* TCP and UDP options all take an 'int' value. */
int_case:
if (get_user_u32(len, optlen))
return -TARGET_EFAULT;
--
2.29.2
- [PULL 1/5] linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls, (continued)
- [PULL 1/5] linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls, Laurent Vivier, 2021/01/20
- [PULL 2/5] linux-user: add missing UDP get/setsockopt option, Laurent Vivier, 2021/01/20
- [PULL 4/5] linux-user: Add IPv6 options to do_print_sockopt(), Laurent Vivier, 2021/01/20
- [PULL 5/5] linux-user: Remove obsolete F_SHLCK and F_EXLCK translation, Laurent Vivier, 2021/01/20
- [PULL 3/5] linux-user: add missing IPv6 get/setsockopt option, Laurent Vivier, 2021/01/20
- Re: [PULL 0/5] Linux user for 6.0 patches, Peter Maydell, 2021/01/21
[PULL 0/5] Linux user for 6.0 patches, Laurent Vivier, 2021/01/21
- [PULL 2/5] linux-user: add missing UDP get/setsockopt option,
Laurent Vivier <=
- [PULL 1/5] linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls, Laurent Vivier, 2021/01/21
- [PULL 5/5] linux-user: Remove obsolete F_SHLCK and F_EXLCK translation, Laurent Vivier, 2021/01/21
- [PULL 4/5] linux-user: Add IPv6 options to do_print_sockopt(), Laurent Vivier, 2021/01/21
- [PULL 3/5] linux-user: add missing IPv6 get/setsockopt option, Laurent Vivier, 2021/01/21
- Re: [PULL 0/5] Linux user for 6.0 patches, Peter Maydell, 2021/01/22