From nobody Wed Oct 29 09:12:09 2025 X-Original-To: dev-commits-src-all@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 4cxM2K6tc4z6DMcd; Wed, 29 Oct 2025 09:12:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxM2K4JSXz3wmq; Wed, 29 Oct 2025 09:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729129; 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=4kDJLZd+IWKYNQ7/eHHuYadNSFzca6AIXvvgy35lM+U=; b=vQVBdI6R+BNSEUUGyjqIn1c4k8wcK9JjMT4AaVwNJ4PtpmWTI4VAXfAavPlW48DNf03yfE bv0KOEDD9ffby3FOtIeCNzem9J/ijIhxDT2k9NXI6vi34/MvsNo1kBrPdH6oEzyAXtJI5D ZmcfJNunttWpbkpOIoVMJvjcJRo7YFIhCjvoZnGlYKkyqn4NOtvctSAPej+5IxKA6TfGpD KhcB5X0cSLu5r37gsFQVGW9xZK0WPO+9rFlun47EizCBNVUlxBfZaJqy5m2OJk1kV31EMj TydT8IMEx5lTv/dkru9vDFlNioy8h6Vvbt/iBiSFkFZ6Me3kn611f4AeNmGpFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729129; 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=4kDJLZd+IWKYNQ7/eHHuYadNSFzca6AIXvvgy35lM+U=; b=ah2lJYBeMhuzs4aSO2B8M7V6z3+Q6dGgDy3ay9wbBUrHXy1rD54bebaWS+ZesG+olfeKbR cGV1Kx7OX2f9pMr2djjpwRnHO9FFkcPeNyK2fnXmkTFDqErEOYTxPdavWSfzGFMFtAz2nk 7ucu0EJiWFBOvGfuW6Rhwht1BBqgo9gmbqr2WMi3qxN0K2cnho1QP3MbBx7aHJ8zX2zp4w ki+gTzjsyie/qzmhqZNEhIZymwvE6TptoB2dCnC5/7hzxhuQNeK0unsiVa/TLrV//wceG3 XNBEbS2aWUYiG5rx3W8EJ7/fpQ5mJQrIwsUZgm0/5MLDWcChia0SJwv1ErcxBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761729129; a=rsa-sha256; cv=none; b=XIeCmUhfNIoOhdCHJE/Lq4BBMVB2BOC/wJf7MAFzvkq5u0/D0LnVo1wlCOFlHtfxr+h5pM tI5kHie9MEoxafPNOLSzA9Zt7indAC7ucYmdx5h2NSQaibH3wDRtyAYW13/SFucUZTIdH0 OSkaHZekXQ8S8xiuOYok/zARsnbRY/+UZrDRKCj/+1Ij2sE/kgtXLGLTLRkmSbvdt6zi4/ X6g1OH6EUYa4TOLrhjPTU3/6YwGHJaVRlBqjrFIET3AEFN4TCvngFYc4vYt41G2I6Km5jk zaKABVYteIKWHrpy21zM4xxujdE6hBON8S8y+SymwCglEz5BY6PX2F1CEBnmHw== 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 4cxM2K3vYBzVRQ; Wed, 29 Oct 2025 09:12:09 +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 59T9C96l011168; Wed, 29 Oct 2025 09:12:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T9C9wh011165; Wed, 29 Oct 2025 09:12:09 GMT (envelope-from git) Date: Wed, 29 Oct 2025 09:12:09 GMT Message-Id: <202510290912.59T9C9wh011165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8f5162f6fc1c - stable/15 - udp: honor IPV6_TCLASS socket option for UDP/IPv4 packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f5162f6fc1c8ac9abc55028561bb5b855fe61b8 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8f5162f6fc1c8ac9abc55028561bb5b855fe61b8 commit 8f5162f6fc1c8ac9abc55028561bb5b855fe61b8 Author: Michael Tuexen AuthorDate: 2025-10-26 17:52:33 +0000 Commit: Michael Tuexen CommitDate: 2025-10-29 09:08:25 +0000 udp: honor IPV6_TCLASS socket option for UDP/IPv4 packets Honor the IPPROTO_IPV6-level socket option IPV6_TCLASS when sending an UDP/IPv4 packet on an AF_INET6 socket. Reviewed by: bz, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53346 (cherry picked from commit 3535546a86846ddb0ca5fe4a0689ac635b504459) --- sys/netinet/udp_usrreq.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 04d01099d54a..6ce1bcce6fc6 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1172,7 +1172,19 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, else INP_RLOCK(inp); NET_EPOCH_ENTER(et); +#ifdef INET6 + if ((flags & PRUS_IPV6) != 0) { + if ((inp->in6p_outputopts != NULL) && + (inp->in6p_outputopts->ip6po_tclass != -1)) + tos = (u_char)inp->in6p_outputopts->ip6po_tclass; + else + tos = 0; + } else { + tos = inp->inp_ip_tos; + } +#else tos = inp->inp_ip_tos; +#endif if (control != NULL) { /* * XXX: Currently, we assume all the optional information is