From owner-dev-commits-src-branches@freebsd.org Mon Oct 4 13:15:39 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id E72D667EA2D;
Mon, 4 Oct 2021 13:15:39 +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 4HNLn763cVz4mM4;
Mon, 4 Oct 2021 13:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 86F2E19F9B;
Mon, 4 Oct 2021 13:15:39 +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 194DFdcg068790;
Mon, 4 Oct 2021 13:15:39 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 194DFdYV068789;
Mon, 4 Oct 2021 13:15:39 GMT (envelope-from git)
Date: Mon, 4 Oct 2021 13:15:39 GMT
Message-Id: <202110041315.194DFdYV068789@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 2c0fcd0ae01a - stable/12 - ipfilter: Print the correct TCP
sequence index number
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 2c0fcd0ae01a1896c60d9dab173fe7538f9befd8
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Oct 2021 13:15:40 -0000
The branch stable/12 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=2c0fcd0ae01a1896c60d9dab173fe7538f9befd8
commit 2c0fcd0ae01a1896c60d9dab173fe7538f9befd8
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-09-25 00:00:20 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-10-04 03:59:31 +0000
ipfilter: Print the correct TCP sequence index number
TCP sequence numbers in the FTP proxy are maintained in a two dimensional
array. The debug message prints the same seq[N] for both. Fix that.
(cherry picked from commit df38343e71304169ebca0e4c4fa24b339982d7be)
---
sys/contrib/ipfilter/netinet/ip_ftp_pxy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
index c4ee0ef593df..f4b40f3601d9 100644
--- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
@@ -1415,7 +1415,7 @@ ipf_p_ftp_process(softf, fin, nat, ftp, rv)
printf("%s:seq[0](%u) + (%d) != (%u)\n",
"ipf_p_ftp_process", t->ftps_seq[0],
ackoff, thack);
- printf("%s:seq[0](%u) + (%d) != (%u)\n",
+ printf("%s:seq[1](%u) + (%d) != (%u)\n",
"ipf_p_ftp_process", t->ftps_seq[1],
ackoff, thack);
}