From nobody Thu Oct 30 04:23:29 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 4cxrZn3PgZz6Djtv; Thu, 30 Oct 2025 04:23:29 +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 4cxrZn2T0zz3Fm0; Thu, 30 Oct 2025 04:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798209; 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=ATAsnLJUKDJYwVlmfEAb3TvYFNPO4K+QzXPIr5gweMY=; b=fjTO3wYbd4Ru62xNb2hgdvwqHZcPg9wQoN3qKjBTTmveayAc7YBeWjW4TiOxdND72bqM7t zDlhhsCcqPGij2oJu6cHZznHJLUwgzw1/1+/iXek+0FMOOJQuAnc6Km2V9ZKQDSz5Utzzk I8w1OR6Tf0cKUZu27fy+m27cofxOH8no+vRVWV650JSB3GsFAtsxV7ki2/WlBGNp8yZi6p bxjFZJMl8yj2KwjRjQsjEZng0/6rw0cAZR7/47CVnu/guKKMM/lwe0tKAeoE5l2cy+5csi g8qHGuH+LhVSc+ee2Wbtnq7+E3kRbUay+f1Ex0UqATKBsRlnTGX4kd8/qQ1V1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798209; 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=ATAsnLJUKDJYwVlmfEAb3TvYFNPO4K+QzXPIr5gweMY=; b=xqkfTCgvqV2uIYNPb1iIA+r0jF0/xG99x/ZCeW3WrO95OjjmljSh2jUM6AFT9gsc6PWrap 9+Ho54Bn+cKC7A4AFST+sDLZyercrRU+yPvjL4516hwnAnzsqewLEgcP0IC1nZxM7+GJf1 GCgh759XVqeTGzFici4kbPOwuVtVBEfcudqPJ0e7eP5hEeXMwbJnBJH6BG7H+MYtGqC07H XMJoPreb44eh/jvCp8Yc3hvEic3kOql27wwR4XqHluZGg0K1jMQiHJ/8sEow8JbKuOZ/Gp 9xvVcLS8HV/LxTUZspvnc1ISI8nKxeQRJMVxALzhPfikLr4B2Jq+CAZ9brVkvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798209; a=rsa-sha256; cv=none; b=cWeLh0p3cy+p3vUr5MgRbJ0Ttk3eyJmk2QIlmcY54yRV29dp1vGjpP8jGokar+oPGzxSo/ speb2CSiW1j8iW2hC44RAsCGNoCoUPZ+hE+TQ/43SfsIleeXkXQBeZo35hfFyhLcRN8FWt aNYOb+1NNqjLHgEKFcbpDuBZZtQY6L4wM12SuG8y6BmDvH6NtiMYz+FRlerLzNvlK64PeX S3x95eB1PTgZV8JoE/58+tkwYu4vXuDfHszTTOSYkCcA0asTy/5W386oCQOzBdaaoOklho y4F/+wLN2y5if1uQaNMFFtkq6brzVzprPZ1Zt0Kb2UqKLyWTUqKPBIknsgHsVA== 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 4cxrZn1tyLz16J2; Thu, 30 Oct 2025 04:23:29 +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 59U4NT3Y083974; Thu, 30 Oct 2025 04:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4NTL7083971; Thu, 30 Oct 2025 04:23:29 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:29 GMT Message-Id: <202510300423.59U4NTL7083971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: bdbb23567f8d - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: bdbb23567f8d9d4d0736927592303dfca599007e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bdbb23567f8d9d4d0736927592303dfca599007e commit bdbb23567f8d9d4d0736927592303dfca599007e Author: Michael Tuexen AuthorDate: 2025-10-26 17:52:33 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:21:53 +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. Approved by: re (cperciva) Reviewed by: bz, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53346 (cherry picked from commit 3535546a86846ddb0ca5fe4a0689ac635b504459) (cherry picked from commit 8f5162f6fc1c8ac9abc55028561bb5b855fe61b8) --- 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