Le 11/01/2016 07:47, cheng...@emindsoft.com.cn a écrit :
> From: Chen Gang <cheng...@emindsoft.com.cn>
>
> Just implement it according to the other features implementations.
>
> Signed-off-by: Chen Gang <gang.chen.5...@gmail.com>
> ---
> linux-user/syscall.c | 18 +++++++++++++++++-
> linux-user/syscall_defs.h | 5 +++++
> 2 files changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 4c68800..fcdca2a 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1410,6 +1410,9 @@ static abi_long do_setsockopt(int sockfd, int level,
> int optname,
> int val;
> struct ip_mreqn *ip_mreq;
> struct ip_mreq_source *ip_mreq_source;
> + struct linger lg;
> + struct target_linger *tlg;
> +
>
> switch(level) {
> case SOL_TCP:
> @@ -1661,7 +1664,20 @@ set_timeout:
> case TARGET_SO_RCVLOWAT:
> optname = SO_RCVLOWAT;
> break;
> - break;
> + case TARGET_SO_LINGER:
> + optname = SO_LINGER;
> + if (optlen != sizeof(struct target_linger)) {
> + return -TARGET_EINVAL;
> + }
> + if (!lock_user_struct(VERIFY_READ, tlg, optval_addr, 1)) {
> + return -TARGET_EFAULT;
> + }
> + __get_user(lg.l_onoff, &tlg->l_onoff);
> + __get_user(lg.l_linger, &tlg->l_linger);
> + ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname,
> + &lg, sizeof(lg)));
> + unlock_user_struct(tlg, optval_addr, 0);
> + return ret;
I think it should be moved before the "/* Options with 'int' argument
*/" comment.
Except that, it is good.
> default:
> goto unimplemented;
> }
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index f996acf..6591e74 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -166,6 +166,11 @@ struct target_ip_mreq_source {
> uint32_t imr_sourceaddr;
> };
>
> +struct target_linger {
> + abi_int l_onoff; /* Linger active */
> + abi_int l_linger; /* How long to linger for */
> +};
> +
> struct target_timeval {
> abi_long tv_sec;
> abi_long tv_usec;
>
