From nobody Fri Feb 21 01:57:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YzYD40BpQz5nmYl; Fri, 21 Feb 2025 01:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzYD34z6Xz3nfZ; Fri, 21 Feb 2025 01:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740103043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EdwSp62UBxAqvmzJHB5E8uZ2DYnC3QJsT3JR0YcxI2g=; b=NVjbSF0cqtOvvLDDWUGNCvJx8qt7juumbifCX+5nP1WWHnU1FNaH8j8HoTazeqx3ZVxIAr pBQvGvY+F0kJqgzJ2nw3ENlBczjJCpuwfjjk9s8fVXPCVl4NqOZ2dgUyTDfi7xwFEagkv6 b7cH/uT2s+uAkF/xFVkm9CXtjQP0uD+L2pmJPp8LRPT9DskEncrP9ey5XkkWP763lhSja2 LbxBvxEQRdpEAfVSbCR5IboIgsZkwJyH40RSXiSnOywrBNA6bNeKSWFCvc+Rtg0fqRIKsB 2uLpWRP48iaD/k78kj9zrJk5axPWR9UOhjjzKQuoLawtslbO4iqxHdhvCYX2XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740103043; a=rsa-sha256; cv=none; b=qv5QdMKJuJAfESRgAMYv1hIrn6A09bEst4u03lPzQ9vbLGQhJHXqIqWi41AGzVPeF+O1oU qiKzGaBKPn0PhHGWxWZO5AmjVKU6B0TTqrB0U5WH20rRs4M8HBmjvVI54tBjFxhPYtNt8S x9dNwkea9KNc+c8vgbN1wqpLJqgK4KQiuehLqxwZmmJWKdQyrU4SxeNJkhttBCuePqooBh fWbKHzSFs73eJ8D3F036GMqx19u0oN57rOPEWFB+gRbqrCjqTudAlDIG9T3dYJ1/ejsWNu Fog/SEN5qfBJaNduQaCigPgqQFqqFYLkl6GxbQvZ94CsqQ4cCTo+h33cYNCZ7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740103043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EdwSp62UBxAqvmzJHB5E8uZ2DYnC3QJsT3JR0YcxI2g=; b=tpdzeB+FoJwkUzyVj4XRumBH5liYAIydvKvhEpUCX382B/xEhCS8khGSvZe4K951dNU7xA fF1VS2Yf47D5jOz5+zjBz0R79fhaJhKPNRExe7LFQMglcxsVXuyOHw7mu2TsbvmTPxOxVC 55Fqufc94xaCh5rqq8nF62cR501Trhrt/rZ7tGElVNWSS0AK2a6rwl/ebOCCYaLPk474l2 r2ZbDJuC9iWT6Bw0sIY6B11kTf1hqKhLl30caqdnl2pOS8/oXCxLOwmFTz6d6VN2Gt1fCL l/sKLkfMLoGGrwyBZXgYy5L4aR6QFSrf+sQ7ciXc4c5dpo5cqQlS6b5WJYktuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YzYD34FJWz1GDf; Fri, 21 Feb 2025 01:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51L1vNSN067627; Fri, 21 Feb 2025 01:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L1vNBQ067624; Fri, 21 Feb 2025 01:57:23 GMT (envelope-from git) Date: Fri, 21 Feb 2025 01:57:23 GMT Message-Id: <202502210157.51L1vNBQ067624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b0f2df45e7a6 - stable/14 - socket: Add an option to retrieve a socket's FIB number List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0f2df45e7a6f1db28bd96fc5da690618a0c38a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b0f2df45e7a6f1db28bd96fc5da690618a0c38a6 commit b0f2df45e7a6f1db28bd96fc5da690618a0c38a6 Author: Mark Johnston AuthorDate: 2025-02-06 14:17:19 +0000 Commit: Mark Johnston CommitDate: 2025-02-21 01:04:50 +0000 socket: Add an option to retrieve a socket's FIB number The SO_SETFIB option can be used to set a socket's FIB number, but there is no way to retrieve it. Rename SO_SETFIB to SO_FIB and implement a handler for it for getsockopt(2). Reviewed by: glebius MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D48834 (cherry picked from commit ee951eb59f2136a604e3fbb12abf8d8344da0c99) --- lib/libc/sys/getsockopt.2 | 4 ++-- sys/kern/uipc_socket.c | 6 ++++++ sys/sys/socket.h | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2 index 548e2f738e22..868f40e97773 100644 --- a/lib/libc/sys/getsockopt.2 +++ b/lib/libc/sys/getsockopt.2 @@ -177,7 +177,7 @@ for the socket .It Dv SO_PROTOTYPE Ta "SunOS alias for the Linux SO_PROTOCOL (get only)" .It Dv SO_ERROR Ta "get and clear error on the socket (get only)" .It Dv SO_RERROR Ta "enables receive error reporting" -.It Dv SO_SETFIB Ta "set the associated FIB (routing table) for the socket (set only)" +.It Dv SO_FIB Ta "get or set the associated FIB (routing table) for the socket" .El .Pp The following options are recognized in @@ -360,7 +360,7 @@ or with the error .Er EWOULDBLOCK if no data were received. .Pp -.Dv SO_SETFIB +.Dv SO_FIB can be used to over-ride the default FIB (routing table) for the given socket. The value must be from 0 to one less than the number returned from the sysctl diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 58090b28fcc8..58e374d7aed2 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -4101,6 +4101,12 @@ integer: error = sooptcopyout(sopt, &optval, sizeof optval); break; + case SO_FIB: + SOCK_LOCK(so); + optval = so->so_fibnum; + SOCK_UNLOCK(so); + goto integer; + case SO_DOMAIN: optval = so->so_proto->pr_domain->dom_family; goto integer; diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 65b5c5ee001d..b2afc735a383 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -166,7 +166,8 @@ typedef __uintptr_t uintptr_t; #define SO_LISTENQLIMIT 0x1011 /* socket's backlog limit */ #define SO_LISTENQLEN 0x1012 /* socket's complete queue length */ #define SO_LISTENINCQLEN 0x1013 /* socket's incomplete queue length */ -#define SO_SETFIB 0x1014 /* use this FIB to route */ +#define SO_FIB 0x1014 /* get or set socket FIB */ +#define SO_SETFIB SO_FIB /* backward compat alias */ #define SO_USER_COOKIE 0x1015 /* user cookie (dummynet etc.) */ #define SO_PROTOCOL 0x1016 /* get socket protocol (Linux name) */ #define SO_PROTOTYPE SO_PROTOCOL /* alias for SO_PROTOCOL (SunOS name) */