Skip to contentSkip to conversation

linux-user: Implement setsockopt SOL_SOCKET/SO_LINGER

PATCH In review Andreas Schwab 2 participants 2 messages Feb 5, 2018 – Feb 15, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux-user: Implement setsockopt SOL_SOCKET/SO_LINGER

---
 linux-user/syscall.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
linux-user/syscall.c +23 -0
index ff89016adc..82848fd97d 100644
@@ -3130,6 +3130,29 @@ set_timeout:
 		unlock_user (dev_ifname, optval_addr, 0);
 		return ret;
 	}
+        case TARGET_SO_LINGER:
+        {
+                struct linger {
+                    int l_onoff;
+                    int l_linger;
+                } linger;
+
+                optname = SO_LINGER;
+
+                if (optlen != sizeof(linger)) {
+                    return -TARGET_EINVAL;
+                }
+                if (copy_from_user(&linger, optval_addr, optlen)) {
+                    return -TARGET_EFAULT;
+                }
+
+                linger.l_onoff = tswap32(linger.l_onoff);
+                linger.l_linger = tswap32(linger.l_linger);
+
+                ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname,
+                                           &linger, sizeof(linger)));
+                return ret;
+        }
             /* Options with 'int' argument.  */
         case TARGET_SO_DEBUG:
 		optname = SO_DEBUG;
Signature · 7 lines
2.16.1


-- 
Andreas Schwab, SUSE Labs, [email protected]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
#1 lore raw

Le 05/02/2018 à 12:40, Andreas Schwab a écrit :

Quoted 30 lines
---
 linux-user/syscall.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
linux-user/syscall.c +16 -0
index ff89016adc..82848fd97d 100644
@@ -3130,6 +3130,29 @@ set_timeout:
 		unlock_user (dev_ifname, optval_addr, 0);
 		return ret;
 	}
+        case TARGET_SO_LINGER:
+        {
+                struct linger {
+                    int l_onoff;
+                    int l_linger;
+                } linger;
+
+                optname = SO_LINGER;
+
+                if (optlen != sizeof(linger)) {
+                    return -TARGET_EINVAL;
+                }
+                if (copy_from_user(&linger, optval_addr, optlen)) {
+                    return -TARGET_EFAULT;
+                }
+

linux-user/syscall.c set_timeout: · line 3158

Quoted 10 lines
linux-user/syscall.c +7 -0
+                linger.l_onoff = tswap32(linger.l_onoff);
+                linger.l_linger = tswap32(linger.l_linger);
+
+                ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname,
+                                           &linger, sizeof(linger)));
+                return ret;
+        }
             /* Options with 'int' argument.  */
         case TARGET_SO_DEBUG:
 		optname = SO_DEBUG;

I think this series gives a more complete solution to the problem:

https://patchwork.ozlabs.org/project/qemu-devel/list/?series=3985
[1/3] linux-user: fix TARGET_SO_LINGER for sparc [2/3] linux-user: add SO_LINGER to setsockopt [3/3] linux-user: add SO_LINGER to getsockopt

but it needs some updates.

Thanks,
Laurent