From nobody Thu Nov 10 15:03:05 2022 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 4N7Q7Z1F5zz4XJr5; Thu, 10 Nov 2022 15:03:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N7Q7Z0j96z4QQW; Thu, 10 Nov 2022 15:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668092586; 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=j2ipp8Al3R3W9mlK+Pdt83QEF708RH0bJgUc8aljgAI=; b=ncRrAyZ4vHuWQr7TQAVl2JxHj6NKysPnZyLpjT6ofYz0thfTHhTHe42HeOR675838WI1vJ 63Ij6oR6mlMOGVOEbtvz+x+2vKz23FJJRW+JdEdDVWno1sl7psvMu4Qn8oAItxLSw0onKu QEwiwc6+dIcLz/mhlDN12NdIwhqy5tVXQmf6m/Djhi+vuoDoJLU1CgjKj1dzLxBZyUC1uH w9pY5Hgl27BuEz0CKqfJxeLP54jltzvqrSOMrfHIT6yTTW8DJJ1wXw6ePbU/GNtt05bmti srkYOG6kGt8PAnU3lmi8txEc4abmQKP0SyLdpwTZU3/UyZiw3PZATtun4xhmUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668092586; 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=j2ipp8Al3R3W9mlK+Pdt83QEF708RH0bJgUc8aljgAI=; b=dLCCxp7ZeScQfoN6/9Z77Lc5Usd7AVcVVgS4YxCKEi7Rzkhf+lYq2A63rN3qGOEqq4+u3j Te2rOGLF6idYH0cV9F95VZmiqBjh6tVye4uTAuOR8BGN6y9hfo04tJPH7N8cpYu7IHdfoj nV3uDjBiLu3oI0GknI3E3ttB+PiWFAj/kyY1PPmxHyak/q2UNzBgXXbUuMIFj27aHLnz98 NJv1j4guNXpUGpDWKURDKweyvDSFkLZee2fUSwfdEMiv9/UjRHb0FEI2Weak1qcPq1PAgD KzmjD/hwVJQZMs2C5+NuhYvHspSq0tzKFIwPWx0Kzj0tOP+XgzBnt1/KFDNogw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668092586; a=rsa-sha256; cv=none; b=Xa/U5Ul2Fiha9gtZjbFGzHuprz4v6nSdrPXV5n2azun1WOxq8aMPpYAK40G1EjAGaosj42 4CwN+se1ibYVEkbCEkOY2V3z0GXjqFlFJR+S/5MxizDJSVukFhumNgj6FBHSGr9lp/4E2W 9rTaIVsQIr1OILFMNeCKYs/KnnWXrrLnkDerGgVZv6/V4urm+bnYXo0Py9bVGEVISmgW8F hQjSUQ8uOPbo/bSI0VLuSGKeG+74mSWN7YdZ4eJOdWSCp2EkKS6B7gvZ7RanA2pQDGiG7r 20HnsxPgG/AepG4fYx5EsHtYEkLFB09m+HLaiC6KBYnuvjg+0nlyuS1JY3mX0A== 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 4N7Q7Y6qfBz15Fs; Thu, 10 Nov 2022 15:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AAF35pH044733; Thu, 10 Nov 2022 15:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAF35Ik044732; Thu, 10 Nov 2022 15:03:05 GMT (envelope-from git) Date: Thu, 10 Nov 2022 15:03:05 GMT Message-Id: <202211101503.2AAF35Ik044732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 86bdbdece4ae - releng/12.4 - ipfw: Have NAT steal the TH_RES1 bit, instead of the TH_AE bit 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 86bdbdece4ae1c3374b6f7e53e24b7a1ae7fa7d8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.4 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=86bdbdece4ae1c3374b6f7e53e24b7a1ae7fa7d8 commit 86bdbdece4ae1c3374b6f7e53e24b7a1ae7fa7d8 Author: Richard Scheffenegger AuthorDate: 2022-11-09 09:54:34 +0000 Commit: Richard Scheffenegger CommitDate: 2022-11-10 15:01:21 +0000 ipfw: Have NAT steal the TH_RES1 bit, instead of the TH_AE bit The NAT module use of the tcphdr.th_x2 field now collides with the use of this TCP header flag as AccECN (AE) bit. Use the topmost bit instead to allow negotiation of AccECN across a NAT device. Event: IETF 115 Hackathon Reviewed By: #transport, tuexen MFC after: 3 days Approved by: re (gjb) Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D37300 (cherry picked from commit 0b00b801493aa1d4996b0891ea58fbef343f85df) (cherry picked from commit 9839a5ad3a683c3841ec00c9e1a4d551dcf9c1de) --- sys/netinet/libalias/alias_ftp.c | 2 +- sys/netinet/libalias/alias_irc.c | 2 +- sys/netinet/libalias/alias_proxy.c | 2 +- sys/netinet/libalias/alias_skinny.c | 6 +++--- sys/netinet/libalias/alias_smedia.c | 4 ++-- sys/netinet/tcp.h | 3 +++ sys/netpfil/ipfw/ip_fw_nat.c | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/netinet/libalias/alias_ftp.c b/sys/netinet/libalias/alias_ftp.c index 962194ec0a68..b2fcfbf2396b 100644 --- a/sys/netinet/libalias/alias_ftp.c +++ b/sys/netinet/libalias/alias_ftp.c @@ -754,7 +754,7 @@ NewFtpMessage(struct libalias *la, struct ip *pip, /* Compute TCP checksum for revised packet */ tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif diff --git a/sys/netinet/libalias/alias_irc.c b/sys/netinet/libalias/alias_irc.c index 32e831742048..524b70b0632c 100644 --- a/sys/netinet/libalias/alias_irc.c +++ b/sys/netinet/libalias/alias_irc.c @@ -458,7 +458,7 @@ AliasHandleIrcOut(struct libalias *la, /* Compute TCP checksum for revised packet */ tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c index 9b75b22a74b3..7efab1fdc8db 100644 --- a/sys/netinet/libalias/alias_proxy.c +++ b/sys/netinet/libalias/alias_proxy.c @@ -368,7 +368,7 @@ ProxyEncodeTcpStream(struct alias_link *lnk, tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c index 31b33696fc20..2c664c2c58d9 100644 --- a/sys/netinet/libalias/alias_skinny.c +++ b/sys/netinet/libalias/alias_skinny.c @@ -216,7 +216,7 @@ alias_skinny_reg_msg(struct RegisterMessage *reg_msg, struct ip *pip, tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif @@ -259,7 +259,7 @@ alias_skinny_port_msg(struct IpPortMessage *port_msg, struct ip *pip, tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif @@ -291,7 +291,7 @@ alias_skinny_opnrcvch_ack(struct libalias *la, struct OpenReceiveChannelAck *opn tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c index 9b5a9d673ecf..c09c8e0c6d77 100644 --- a/sys/netinet/libalias/alias_smedia.c +++ b/sys/netinet/libalias/alias_smedia.c @@ -404,7 +404,7 @@ alias_rtsp_out(struct libalias *la, struct ip *pip, tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif @@ -451,7 +451,7 @@ alias_pna_out(struct libalias *la, struct ip *pip, /* Compute TCP checksum for revised packet */ tc->th_sum = 0; #ifdef _KERNEL - tc->th_x2 = 1; + tc->th_x2 = (TH_RES1 >> 8); #else tc->th_sum = TcpChecksum(pip); #endif diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 21922eb4df2e..beb6ece82f35 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -72,6 +72,9 @@ struct tcphdr { #define TH_ECE 0x40 #define TH_CWR 0x80 #define TH_AE 0x100 /* maps into th_x2 */ +#define TH_RES3 0x200 +#define TH_RES2 0x400 +#define TH_RES1 0x800 #define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|TH_ECE|TH_CWR) #define PRINT_TH_FLAGS "\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE\10CWR\11AE" diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index 9e15e9addbe5..b75210246a00 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -416,7 +416,7 @@ ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) struct tcphdr *th; th = (struct tcphdr *)(ip + 1); - if (th->th_x2) + if (th->th_x2 & (TH_RES1 >> 8)) ldt = 1; } @@ -436,7 +436,7 @@ ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) * Maybe it was set in * libalias... */ - th->th_x2 = 0; + th->th_x2 &= ~(TH_RES1 >> 8); th->th_sum = cksum; mcl->m_pkthdr.csum_data = offsetof(struct tcphdr, th_sum);