 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_socket.c,v 1.151 2020/10/24 09:01:56 mgorny Exp $	*/
+/*	$NetBSD: linux_socket.c,v 1.152 2020/11/03 22:08:44 christos Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Functions in multiarch:
  *	linux_sys_socketcall		: linux_socketcall.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.151 2020/10/24 09:01:56 mgorny Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.152 2020/11/03 22:08:44 christos Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #endif /* defined(_KERNEL_OPT) */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 @@ -851,59 +851,90 @@ linux_to_bsd_sopt_level(int llevel)
 /*
  * Convert Linux socket level socket option numbers to NetBSD values.
  */
 int
 linux_to_bsd_so_sockopt(int lopt)
+{
 	switch (lopt) {
 	case LINUX_SO_DEBUG:
 		return SO_DEBUG;
 	case LINUX_SO_REUSEADDR:
 		/*
-		 * Linux does not implement SO_REUSEPORT, but allows reuse of a
+		 * Linux does not implement SO_REUSEPORT, but allows reuse of
-		 * host:port pair through SO_REUSEADDR even if the address is not a
+		 * a host:port pair through SO_REUSEADDR even if the address
-		 * multicast-address.  Effectively, this means that we should use
+		 * is not a multicast-address. Effectively, this means that we
-		 * SO_REUSEPORT to allow Linux applications to not exit with
+		 * should use SO_REUSEPORT to allow Linux applications to not
-		 * EADDRINUSE
+		 * exit with EADDRINUSE
 		 */
 		return SO_REUSEPORT;
 	case LINUX_SO_TYPE:
 		return SO_TYPE;
 	case LINUX_SO_ERROR:
 		return SO_ERROR;
 	case LINUX_SO_DONTROUTE:
 		return SO_DONTROUTE;
 	case LINUX_SO_BROADCAST:
 		return SO_BROADCAST;
 	case LINUX_SO_SNDBUF:
 		return SO_SNDBUF;
 	case LINUX_SO_RCVBUF:
 		return SO_RCVBUF;
 	case LINUX_SO_SNDLOWAT:
 		return SO_SNDLOWAT;
 	case LINUX_SO_RCVLOWAT:
 		return SO_RCVLOWAT;
 	case LINUX_SO_KEEPALIVE:
 		return SO_KEEPALIVE;
 	case LINUX_SO_OOBINLINE:
 		return SO_OOBINLINE;
 	case LINUX_SO_NO_CHECK:
 	case LINUX_SO_PRIORITY:
 		return -1;
 	case LINUX_SO_LINGER:
 		return SO_LINGER;
 	case LINUX_SO_BSDCOMPAT:
 	case LINUX_SO_PASSCRED:
 	case LINUX_SO_PEERCRED:
 		return -1;
 	case LINUX_SO_RCVLOWAT:
 		return SO_RCVLOWAT;
 	case LINUX_SO_SNDLOWAT:
 		return SO_SNDLOWAT;
 	case LINUX_SO_RCVTIMEO:
 		return SO_RCVTIMEO;
 	case LINUX_SO_SNDTIMEO:
 		return SO_SNDTIMEO;
 	case LINUX_SO_SECURITY_AUTHENTICATION:
 	case LINUX_SO_SECURITY_ENCRYPTION_TRANSPORT:
 	case LINUX_SO_SECURITY_ENCRYPTION_NETWORK:
 	case LINUX_SO_BINDTODEVICE:
 	case LINUX_SO_ATTACH_FILTER:
 	case LINUX_SO_DETACH_FILTER:
 	case LINUX_SO_PEERNAME:
 		return -1;
 	case LINUX_SO_TIMESTAMP:
 		return SO_TIMESTAMP;
 	case LINUX_SO_ACCEPTCONN:
-		return SO_ACCEPTCONN;
+	case LINUX_SO_PEERSEC:
-	case LINUX_SO_PRIORITY:
+	case LINUX_SO_SNDBUFFORCE:
-	case LINUX_SO_NO_CHECK:
+	case LINUX_SO_RCVBUFFORCE:
 	case LINUX_SO_PASSSEC:
 	case LINUX_SO_TIMESTAMPNS:
 	case LINUX_SO_MARK:
 	case LINUX_SO_TIMESTAMPING:
 	case LINUX_SO_PROTOCOL:
 	case LINUX_SO_DOMAIN:
 	case LINUX_SO_RXQ_OVFL:
 	case LINUX_SO_WIFI_STATUS:
 	case LINUX_SO_PEEK_OFF:
 	case LINUX_SO_NOFCS:
 	default:
 		return -1;
+	}
+}
 /*
  * Convert Linux IP level socket option number to NetBSD values.
  */
 int
 linux_to_bsd_ip_sockopt(int lopt)
+{
 	switch (lopt) {