diff options
| author | Laurent Vivier <Laurent@Vivier.EU> | 2013-01-01 08:24:11 +0000 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2013-01-30 12:13:21 +0100 |
| commit | 1b09aeb90827c1d91383a9eae42ce8f25909857b (patch) | |
| tree | 54ef83c88cb22ea234ae31d7ac350fc8309e0aee /linux-user/syscall.c | |
| parent | 910ee4e5f4a1df5b1bd144dfca1ae466e2a86a78 (diff) | |
| download | focaccia-qemu-1b09aeb90827c1d91383a9eae42ce8f25909857b.tar.gz focaccia-qemu-1b09aeb90827c1d91383a9eae42ce8f25909857b.zip | |
linux-user: correct setsockopt()
SO_SNDTIMEO and SO_RCVTIMEO take a struct timeval, not an int
To test this, you can use :
QEMU_STRACE= ping localhost 2>&1 |grep TIMEO
568 setsockopt(3,SOL_SOCKET,SO_SNDTIMEO,{1,0},8) = 0
568 setsockopt(3,SOL_SOCKET,SO_RCVTIMEO,{1,0},8) = 0
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a6f42718c8..151f4f3272 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1489,6 +1489,28 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, break; case TARGET_SOL_SOCKET: switch (optname) { + case TARGET_SO_RCVTIMEO: + { + struct timeval tv; + + optname = SO_RCVTIMEO; + +set_timeout: + if (optlen != sizeof(struct target_timeval)) { + return -TARGET_EINVAL; + } + + if (copy_from_user_timeval(&tv, optval_addr)) { + return -TARGET_EFAULT; + } + + ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname, + &tv, sizeof(tv))); + return ret; + } + case TARGET_SO_SNDTIMEO: + optname = SO_SNDTIMEO; + goto set_timeout; /* Options with 'int' argument. */ case TARGET_SO_DEBUG: optname = SO_DEBUG; @@ -1540,12 +1562,6 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, case TARGET_SO_RCVLOWAT: optname = SO_RCVLOWAT; break; - case TARGET_SO_RCVTIMEO: - optname = SO_RCVTIMEO; - break; - case TARGET_SO_SNDTIMEO: - optname = SO_SNDTIMEO; - break; break; default: goto unimplemented; |