svn commit: r338136 - in head: lib/libc/sys sys/kern sys/sys

[Michael Tuexen]

Author: tuexen
Date: Tue Aug 21 14:04:30 2018
New Revision: 338136
URL: https://svnweb.freebsd.org/changeset/base/338136

Log:
  Add SOL_SOCKET level socket option with name SO_DOMAIN to get
  the domain of a socket.
  
  This is helpful when testing and Solaris and Linux have the same
  socket option using the same name.
  
  Reviewed by:		bcr@, rrs@
  Sponsored by:		Netflix, Inc.
  Differential Revision:	https://reviews.freebsd.org/D16791

Modified:
  head/lib/libc/sys/getsockopt.2
  head/sys/kern/uipc_socket.c
  head/sys/sys/socket.h

Modified: head/lib/libc/sys/getsockopt.2
==============================================================================
--- head/lib/libc/sys/getsockopt.2	Tue Aug 21 13:37:06 2018	(r338135)
+++ head/lib/libc/sys/getsockopt.2	Tue Aug 21 14:04:30 2018	(r338136)
@@ -28,7 +28,7 @@
 .\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
 .\" $FreeBSD$
 .\"
-.Dd May 9, 2018
+.Dd August 21, 2018
 .Dt GETSOCKOPT 2
 .Os
 .Sh NAME
@@ -172,6 +172,7 @@ for the socket
 .It Dv SO_TIMESTAMP Ta "enables reception of a timestamp with datagrams"
 .It Dv SO_BINTIME Ta "enables reception of a timestamp with datagrams"
 .It Dv SO_ACCEPTCONN Ta "get listening status of the socket (get only)"
+.It Dv SO_DOMAIN Ta "get the domain of the socket (get only)"
 .It Dv SO_TYPE Ta "get the type of the socket (get only)"
 .It Dv SO_PROTOCOL Ta "get the protocol number for the socket (get only)"
 .It Dv SO_PROTOTYPE Ta "SunOS alias for the Linux SO_PROTOCOL (get only)"

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Tue Aug 21 13:37:06 2018	(r338135)
+++ head/sys/kern/uipc_socket.c	Tue Aug 21 14:04:30 2018	(r338136)
@@ -3008,6 +3008,10 @@ integer:
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
 
+		case SO_DOMAIN:
+			optval = so->so_proto->pr_domain->dom_family;
+			goto integer;
+
 		case SO_TYPE:
 			optval = so->so_type;
 			goto integer;

Modified: head/sys/sys/socket.h
==============================================================================
--- head/sys/sys/socket.h	Tue Aug 21 13:37:06 2018	(r338135)
+++ head/sys/sys/socket.h	Tue Aug 21 14:04:30 2018	(r338136)
@@ -171,6 +171,7 @@ typedef	__uintptr_t	uintptr_t;
 #define	SO_PROTOTYPE	SO_PROTOCOL	/* alias for SO_PROTOCOL (SunOS name) */
 #define	SO_TS_CLOCK	0x1017		/* clock type used for SO_TIMESTAMP */
 #define	SO_MAX_PACING_RATE	0x1018	/* socket's max TX pacing rate (Linux name) */
+#define	SO_DOMAIN	0x1019		/* get socket domain */
 #endif
 
 #if __BSD_VISIBLE