From nobody Tue Jan 04 02:07:47 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 D7164191FF72; Tue, 4 Jan 2022 02:07:50 +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 4JSbc41Tv4z3D65; Tue, 4 Jan 2022 02:07:48 +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 B57FA10B9D; Tue, 4 Jan 2022 02:07:47 +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 20427lff042859; Tue, 4 Jan 2022 02:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20427lNR042858; Tue, 4 Jan 2022 02:07:47 GMT (envelope-from git) Date: Tue, 4 Jan 2022 02:07:47 GMT Message-Id: <202201040207.20427lNR042858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: b6f072f767c5 - main - ipfilter: Unconditionally expose SDT probe frb_natv4in 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6f072f767c58aca8d9440f9c1785731f58e815c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641262069; 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=Oz7RbnWScCuW8qm6HwYCWYSioEKD89lqy48Ud/oK190=; b=OwU2cvZfjnVG4W8g3rJqOx9ocEjkwXEyYeHn9cWB1D3L1uUrUACFynjBKCZ7//sbpB8ik0 Kilwomc8pvb5nYzBAF8knq/3qXr2VmXl55Rcb6VoqkThITWfosPrsbCvPY1k31tdJCL/2r J5MrbzgjQdKxxViMJTOnsKpcyo490jTaGAR94WEIwTvzaKrBJ6EKMYeC6iztUzz/bAarBa U7pmY05rZwbpyumGsHwi7t+reYuFag2+JpSb2H/3vF7kBXkJddkOLEnoZHX1YDTj3OgcKj kq19ek7O5cqZZcaG1EPCiMa4nkFP2msfPOFqLU5EBQba58QKtqI7goSjgpXUdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641262069; a=rsa-sha256; cv=none; b=KCrNhMdHtZCFbsQ1IdI/3r945vDAvBOzjVvUNJMphja6AkMIMZXuidFgulqZZQBNLIfdgt TaTvJq4X+mfJ7VR2nkeOZO94aJCGTyXqLPrP/mddtW7GWrNWMtW0Uek2fSW3wkUT2o8FP6 uFJU9MEO4o62ILOZOlMaD3i/AgFURT2anYGVkJ1POyXmQMVT1rBOSqQrphWrr8Pg6UN7/l FEX+TAIkvGiAMDVeUk4dqBjX1EmlGtKpIlad5NMUMWrNKPBu1Wex2h51/I3IxbfeB8wRF9 3PNx06cWgT3m5IIjtD7DaB0uwCKya/xZiptqWMwWAbg2HJFu+stSNi+jdx5/Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b6f072f767c58aca8d9440f9c1785731f58e815c commit b6f072f767c58aca8d9440f9c1785731f58e815c Author: Cy Schubert AuthorDate: 2021-12-29 01:41:03 +0000 Commit: Cy Schubert CommitDate: 2022-01-04 02:06:44 +0000 ipfilter: Unconditionally expose SDT probe frb_natv4in SDT probe frb_natv4in is only available when an error is encountered. Make it also available when no error is encountered, i.e. NATed and not translated. MFC after: 1 week --- sys/netpfil/ipfilter/netinet/ip_nat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c index d2d0618e0a8c..48c13aa18a86 100644 --- a/sys/netpfil/ipfilter/netinet/ip_nat.c +++ b/sys/netpfil/ipfilter/netinet/ip_nat.c @@ -5412,6 +5412,7 @@ retry_roundrobin: inmatchfail: RWLOCK_EXIT(&softc->ipf_nat); + DT2(frb_natv4in, fr_info_t *, fin, int, rval); switch (rval) { case -3 : @@ -5423,7 +5424,6 @@ inmatchfail: case -1 : /* proxy failure detected by ipf_nat_in() */ if (passp != NULL) { - DT2(frb_natv4in, fr_info_t *, fin, int, rval); NBUMPSIDED(0, ns_drop); *passp = FR_BLOCK; fin->fin_reason = FRB_NATV4;