From nobody Tue Jan 11 01:42:06 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 AD190194A6A9; Tue, 11 Jan 2022 01:42: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 4JXtjB3M3bz3tjY; Tue, 11 Jan 2022 01:42:06 +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 5353C7DCF; Tue, 11 Jan 2022 01:42:06 +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 20B1g6fL077465; Tue, 11 Jan 2022 01:42:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20B1g654077464; Tue, 11 Jan 2022 01:42:06 GMT (envelope-from git) Date: Tue, 11 Jan 2022 01:42:06 GMT Message-Id: <202201110142.20B1g654077464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2c3f2c5ddcf4 - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 2c3f2c5ddcf4931e9aa4754b0967517c8426f8a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641865326; 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=h38+FHVztGmR/brfr5lye+xLZsXm3EXJgMlHGQ2ruPk=; b=Yh8bNyzFG37oChJ+RFNaKawSflKo8jd/Sa1Sbk1iGaOCMG5yn/eI49wOKqrEAZfR83+DbW ZpszUEdnGcmcaO+nuiVRDCaZ7QTkF0aMuUSH58BYdJCD3eI12CJSkAtrkeXjlYaU9uIqwd Inh+q/P9zYx1QtTDRkysMZbsbCNlI93Ymoof4JroArzRwVqgtLFQZv21Ujdmm3uSoaLM/3 vl/5+R+SH1iwotH3bCI+lqQ8nbYQLzw7WBoS/5U39RmIs+QrrgzZHTmqnXwSMrcoulhQaN MlmXJ3PZzlBOEJ8z0Fdi8Vs8FUQPkwDbV37pbpaNfiihh+yeH0ihrTmyZx09OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641865326; a=rsa-sha256; cv=none; b=TVw1cmUnRroK31bGBveY0edGHcLCI0HldDxotMU1rxRzyevAAW69Ra+n/I8sAyV4FIBPtD 3CZkyGpWsc91gjCOvWhYSzxo3ERD3H+KxivvDsbLLC+dSBtXVyBrKeCQA8949hwKUSXEQq joqiX92OkmVhZCOF17YPc/91lj3bAelT6LhoJpteqpp6NTGN1/i9uK9B3Q8cIxatTaGBcd kNS4X0JBafqpUvPDJ7VbPrhNHPqGa7ZmG6QI+it5NxMLGT7u00DvS+RIi71XE/vL0QsM8/ 65jjI1wYncvDszy2+eNaZ0yrdT6BnFYCW9WazF2QXZjz1Sq58PI7P2A3YOW4QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2c3f2c5ddcf4931e9aa4754b0967517c8426f8a7 commit 2c3f2c5ddcf4931e9aa4754b0967517c8426f8a7 Author: Cy Schubert AuthorDate: 2021-12-29 01:41:03 +0000 Commit: Cy Schubert CommitDate: 2022-01-10 15:09:26 +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. (cherry picked from commit b6f072f767c58aca8d9440f9c1785731f58e815c) --- sys/contrib/ipfilter/netinet/ip_nat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index b0ac1a23c723..3fe092277776 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -5521,6 +5521,7 @@ retry_roundrobin: inmatchfail: RWLOCK_EXIT(&softc->ipf_nat); + DT2(frb_natv4in, fr_info_t *, fin, int, rval); switch (rval) { case -3 : @@ -5532,7 +5533,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;