diff mbox series

[v2] linux-user: Add missing IPV6 sockopts

Message ID 20190310111216.GA5578@ls3530.dellerweb.de
State New
Headers show
Series [v2] linux-user: Add missing IPV6 sockopts | expand

Commit Message

Helge Deller March 10, 2019, 11:12 a.m. UTC 
When running ssh over IPv6 with linux-user I faced this warning:
 Unsupported setsockopt level=41 optname=67
 setsockopt IPV6_TCLASS 32: Protocol not available:

This patch adds code to the linux-user emulatation for setting and
retrieving of a few missing IPV6 options, including IPV6_TCLASS.

Signed-off-by: Helge Deller <deller@gmx.de>

Comments

Laurent Vivier March 10, 2019, 4:01 p.m. UTC | #1 
On 10/03/2019 12:12, Helge Deller wrote:
> When running ssh over IPv6 with linux-user I faced this warning:
>  Unsupported setsockopt level=41 optname=67
>  setsockopt IPV6_TCLASS 32: Protocol not available:
> 
> This patch adds code to the linux-user emulatation for setting and
> retrieving of a few missing IPV6 options, including IPV6_TCLASS.
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 208fd1813d..0da51b1208 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1871,6 +1874,20 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
>          case IPV6_RECVHOPLIMIT:
>          case IPV6_2292HOPLIMIT:
>          case IPV6_CHECKSUM:
> +        case IPV6_ADDRFORM:
> +        case IPV6_2292PKTINFO:
> +        case IPV6_RECVTCLASS:
> +        case IPV6_RECVRTHDR:
> +        case IPV6_2292RTHDR:
> +        case IPV6_RECVHOPOPTS:
> +        case IPV6_2292HOPOPTS:
> +        case IPV6_RECVDSTOPTS:
> +        case IPV6_2292DSTOPTS:
> +        case IPV6_TCLASS:
> +        case IPV6_RECVPATHMTU:
> +        case IPV6_TRANSPARENT:
> +        case IPV6_FREEBIND:
> +        case IPV6_RECVORIGDSTADDR:
>              val = 0;
>              if (optlen < sizeof(uint32_t)) {
>                  return -TARGET_EINVAL;
> @@ -2365,6 +2382,20 @@ static abi_long do_getsockopt(int sockfd, int level, int optname,
>          case IPV6_RECVHOPLIMIT:
>          case IPV6_2292HOPLIMIT:
>          case IPV6_CHECKSUM:
> +        case IPV6_ADDRFORM:
> +        case IPV6_2292PKTINFO:
> +        case IPV6_RECVTCLASS:
> +        case IPV6_RECVRTHDR:
> +        case IPV6_2292RTHDR:
> +        case IPV6_RECVHOPOPTS:
> +        case IPV6_2292HOPOPTS:
> +        case IPV6_RECVDSTOPTS:
> +        case IPV6_2292DSTOPTS:
> +        case IPV6_TCLASS:
> +        case IPV6_RECVPATHMTU:
> +        case IPV6_TRANSPARENT:
> +        case IPV6_FREEBIND:
> +        case IPV6_RECVORIGDSTADDR:
>              if (get_user_u32(len, optlen))
>                  return -TARGET_EFAULT;
>              if (len < 0)
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Laurent Vivier March 10, 2019, 4:22 p.m. UTC | #2 
On 10/03/2019 12:12, Helge Deller wrote:
> When running ssh over IPv6 with linux-user I faced this warning:
>  Unsupported setsockopt level=41 optname=67
>  setsockopt IPV6_TCLASS 32: Protocol not available:
> 
> This patch adds code to the linux-user emulatation for setting and
> retrieving of a few missing IPV6 options, including IPV6_TCLASS.
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 208fd1813d..0da51b1208 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1871,6 +1874,20 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
>          case IPV6_RECVHOPLIMIT:
>          case IPV6_2292HOPLIMIT:
>          case IPV6_CHECKSUM:
> +        case IPV6_ADDRFORM:
> +        case IPV6_2292PKTINFO:
> +        case IPV6_RECVTCLASS:
> +        case IPV6_RECVRTHDR:
> +        case IPV6_2292RTHDR:
> +        case IPV6_RECVHOPOPTS:
> +        case IPV6_2292HOPOPTS:
> +        case IPV6_RECVDSTOPTS:
> +        case IPV6_2292DSTOPTS:
> +        case IPV6_TCLASS:
> +        case IPV6_RECVPATHMTU:
> +        case IPV6_TRANSPARENT:
> +        case IPV6_FREEBIND:
> +        case IPV6_RECVORIGDSTADDR:
>              val = 0;
>              if (optlen < sizeof(uint32_t)) {
>                  return -TARGET_EINVAL;
> @@ -2365,6 +2382,20 @@ static abi_long do_getsockopt(int sockfd, int level, int optname,
>          case IPV6_RECVHOPLIMIT:
>          case IPV6_2292HOPLIMIT:
>          case IPV6_CHECKSUM:
> +        case IPV6_ADDRFORM:
> +        case IPV6_2292PKTINFO:
> +        case IPV6_RECVTCLASS:
> +        case IPV6_RECVRTHDR:
> +        case IPV6_2292RTHDR:
> +        case IPV6_RECVHOPOPTS:
> +        case IPV6_2292HOPOPTS:
> +        case IPV6_RECVDSTOPTS:
> +        case IPV6_2292DSTOPTS:
> +        case IPV6_TCLASS:
> +        case IPV6_RECVPATHMTU:
> +        case IPV6_TRANSPARENT:
> +        case IPV6_FREEBIND:
> +        case IPV6_RECVORIGDSTADDR:
>              if (get_user_u32(len, optlen))
>                  return -TARGET_EFAULT;
>              if (len < 0)
> 

Applied to my linux-user branch.

Thanks,
Laurent
diff mbox series

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 208fd1813d..0da51b1208 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1871,6 +1874,20 @@  static abi_long do_setsockopt(int sockfd, int level, int optname,
         case IPV6_RECVHOPLIMIT:
         case IPV6_2292HOPLIMIT:
         case IPV6_CHECKSUM:
+        case IPV6_ADDRFORM:
+        case IPV6_2292PKTINFO:
+        case IPV6_RECVTCLASS:
+        case IPV6_RECVRTHDR:
+        case IPV6_2292RTHDR:
+        case IPV6_RECVHOPOPTS:
+        case IPV6_2292HOPOPTS:
+        case IPV6_RECVDSTOPTS:
+        case IPV6_2292DSTOPTS:
+        case IPV6_TCLASS:
+        case IPV6_RECVPATHMTU:
+        case IPV6_TRANSPARENT:
+        case IPV6_FREEBIND:
+        case IPV6_RECVORIGDSTADDR:
             val = 0;
             if (optlen < sizeof(uint32_t)) {
                 return -TARGET_EINVAL;
@@ -2365,6 +2382,20 @@  static abi_long do_getsockopt(int sockfd, int level, int optname,
         case IPV6_RECVHOPLIMIT:
         case IPV6_2292HOPLIMIT:
         case IPV6_CHECKSUM:
+        case IPV6_ADDRFORM:
+        case IPV6_2292PKTINFO:
+        case IPV6_RECVTCLASS:
+        case IPV6_RECVRTHDR:
+        case IPV6_2292RTHDR:
+        case IPV6_RECVHOPOPTS:
+        case IPV6_2292HOPOPTS:
+        case IPV6_RECVDSTOPTS:
+        case IPV6_2292DSTOPTS:
+        case IPV6_TCLASS:
+        case IPV6_RECVPATHMTU:
+        case IPV6_TRANSPARENT:
+        case IPV6_FREEBIND:
+        case IPV6_RECVORIGDSTADDR:
             if (get_user_u32(len, optlen))
                 return -TARGET_EFAULT;
             if (len < 0)