From nobody Thu Feb 06 16:27:33 2025 X-Original-To: dev-commits-src-main@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 4YpjF15V4qz5mhVs; Thu, 06 Feb 2025 16:27:33 +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 4YpjF129mvz4Mvg; Thu, 06 Feb 2025 16:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738859253; 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=LAzlQ4jVvSc7tLOwnq2NUDbm9BhnilKLUngjKSl7BmE=; b=hpQT+0invL1n4ltmN+D/b8m+ltm4WTX03jzjx1LDgXAJLSu/2BEECH1O93MC9UxmhpSE1Q ZPTNmb3pWWuN8yd0tnUlvTlM0pcfaESVJCv4+ICebxEBgPY4Vr2gmFWA1aV5PL8eUwzGHh prOuUJhnkiiZebIZwtsVM+4rq0Xl0w2i3l+gAJzEMQ6oddBplqTEErpvJfA3MsGTOddUz4 MyXHhi8kxF/F+0IJIXE5776OpedLehuEfRQJvw5gsrkBkoNtfZIhFFjdj3IDjJ0Hul1hiK WzqFSGsU7F1uyTlBWenb5iPYjfSwWimEwYAwhQHajq1hULg6wWlj114ukfYsOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738859253; 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=LAzlQ4jVvSc7tLOwnq2NUDbm9BhnilKLUngjKSl7BmE=; b=qABpCORkJPs64AN+afmX2ipUY0/Uz00m4dqGg/8/QtvTY9hNOViH/i48IjH4wpFOeA8W95 eUqFzimkgy34N8tPag/shbO5hao2tbG3zeTYLynfxXuAMpJ/+O0mEzRQ6igtiNInUrgazJ tZ1LpHM2H+He5RlMn5hNiROaTjt2OMEXD354JRYIEVSTUD1IQIqHoQhMncy63yGPVqktvo P9b0eFN0Y2Ob1dUFW88vbBziGVXJAi0IMB3fg6IGgutqPuHypZYowlZaKESxdbQO6fnJvC ZsHK9cHZn6sUXeXvEmEJkOttJSxWMkB7Mq69+XEjJZRyAb1P5fkB+C3jXyREIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738859253; a=rsa-sha256; cv=none; b=VcXZIZT9XTi2m16tfWwtmdqgpcGFNIuof2i1OICoxjJE1/yKmOwZkXVHfUKSVZpnhPlIrp 3amGGKXKYuk3maYjjS09jOKYxH26feiTDVbLn8JOTW/WzYxcV/WNRYULG/iO8WVp6rNkkP ogJc22vmCWK1eYmjdLKUEEpBffCeNPfM4rwlr4/XPJNFs5z+mh/dPRSP/jTnGlG7hPSik3 aygV+U6qeqL9RMsvM4q3z2RpO9xsROPGnxe5xWa5gyFHMNJhWtMc7yWDUtU6r4/Ib09TMx wP0V+HENMiofqRziYcm9XmcGRhVE1cKgF/p9iInRoZdfd2ghjnWXs/u4+oU3ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpjF117HJzlyQ; Thu, 06 Feb 2025 16:27:33 +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 516GRXE6095376; Thu, 6 Feb 2025 16:27:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516GRX1g095374; Thu, 6 Feb 2025 16:27:33 GMT (envelope-from git) Date: Thu, 6 Feb 2025 16:27:33 GMT Message-Id: <202502061627.516GRX1g095374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ee951eb59f21 - main - socket: Add an option to retrieve a socket's FIB number List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ee951eb59f2136a604e3fbb12abf8d8344da0c99 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee951eb59f2136a604e3fbb12abf8d8344da0c99 commit ee951eb59f2136a604e3fbb12abf8d8344da0c99 Author: Mark Johnston AuthorDate: 2025-02-06 14:17:19 +0000 Commit: Mark Johnston CommitDate: 2025-02-06 14:17:19 +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 --- lib/libsys/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/libsys/getsockopt.2 b/lib/libsys/getsockopt.2 index 15e4b76311d8..619540b53fae 100644 --- a/lib/libsys/getsockopt.2 +++ b/lib/libsys/getsockopt.2 @@ -175,7 +175,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 @@ -358,7 +358,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 65cea2e067cf..03bfea721dd2 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -4106,6 +4106,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 cc82d97e9dd5..2ef455991491 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -164,7 +164,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) */