From nobody Sun Oct 26 17:55:41 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 4cvknn4FLCz6DghV; Sun, 26 Oct 2025 17:55:41 +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 4cvknn3B92z42DL; Sun, 26 Oct 2025 17:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501341; 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=AOCFx4acrhnuhkZevsZzradOABEsM1HmFbE3zR2DEYY=; b=VwlQ6bt7ffcJXL5gVqdv2NW3a51LC6+Ges1cFCP4kpQ1LY+3TnUjc+EyJNZ2LAyrvua+Ak k78C70w7ut9V4gYfvKM70r0JG+XNb60oBd/z0ZzTqIOQ9KFEDwgzFXUiGUfLzEmGWG/jiB 9kyE1m7T+r+9roo4e45a35MDE2l2ROry5hTgg7kPZJktban51v4cTgQ9u5z21GtgsD1kGW RlzHSm/88YCIKsdLGLDt6VXmjxS9TOGiOjscdKrxTItzFNGexHP25S0GtGMXEfRuHhlTg1 6ZLkt6rAVPO8HjPEPYbCFO7PJv61KrCxA7W+pJwV35j/lJ5flFohij0ub1a7Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501341; 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=AOCFx4acrhnuhkZevsZzradOABEsM1HmFbE3zR2DEYY=; b=ucXZuiFp5ETJwKEz+rV5U//gfqmbC1e73hwFQdI+fjyp5xokxXsNIK7dqMZl5mEwNixVtX 5+irPJraqek/OeTVU54YDUUVEFLfEsPG2MOFCtQ26iR/GLWX2wZ8vlkEkiVjmHqnApOtc6 2H1kGOWe+wlwJFbEjHjq6vr9UJ3hTaGZk8O8tZKyjGyoGXDOt3EcBva2mbMc9k321DmNqm dkLOknrDyydoEu2cTSTumP4ehOhLHyyJCGdry4MglZPmU66GsBDsrid3YIxwcWU/COufJ6 NNwQg5+uAF60zz8yO2V3ub5vSrpJNq8l2HdtXRgJKkcBFMT+BCKj/pxB9L7NXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761501341; a=rsa-sha256; cv=none; b=CY3OpR+touUynQrFEwaOYgAoij1sYp/lDwX1DKQV8NueEUcTZ1i10jZwYyJREfLNeVv6b6 UtVlIhhH10W+QwjDFqjxj6947FMDWHIPctyu9rBYibdUXtQ036W8sx6CUIs1PwxrPeABkI jLO4QGrnPvJkuk5bedsD66YKkBhO/uHD33UbXzvJtV5F4XHn8TWpXVxaeRZynwsy9IyNmt z9UrIlirsAM3qS938gfN9wwJAv0+rMRXzQzHblRksoZewfOi+l/ZCIddigJ3lccziziy+s a5V0dNUtuagpdCPhHusarHIpvyfkSK7hAtPcOopIXTUcpUa3fAtvarGr8VEvaw== 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 4cvknn2ll3zkRf; Sun, 26 Oct 2025 17:55:41 +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 59QHtfkV016829; Sun, 26 Oct 2025 17:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QHtfsJ016826; Sun, 26 Oct 2025 17:55:41 GMT (envelope-from git) Date: Sun, 26 Oct 2025 17:55:41 GMT Message-Id: <202510261755.59QHtfsJ016826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3535546a8684 - main - udp: honor IPV6_TCLASS socket option for UDP/IPv4 packets 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3535546a86846ddb0ca5fe4a0689ac635b504459 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3535546a86846ddb0ca5fe4a0689ac635b504459 commit 3535546a86846ddb0ca5fe4a0689ac635b504459 Author: Michael Tuexen AuthorDate: 2025-10-26 17:52:33 +0000 Commit: Michael Tuexen CommitDate: 2025-10-26 17:52:33 +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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53346 --- 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