From nobody Tue Jan 11 01:39:19 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 E32A11949D59; Tue, 11 Jan 2022 01:39:19 +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 4JXtdz4hntz3t2J; Tue, 11 Jan 2022 01:39:19 +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 7D6017E42; Tue, 11 Jan 2022 01:39:19 +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 20B1dJEt064932; Tue, 11 Jan 2022 01:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20B1dJKw064931; Tue, 11 Jan 2022 01:39:19 GMT (envelope-from git) Date: Tue, 11 Jan 2022 01:39:19 GMT Message-Id: <202201110139.20B1dJKw064931@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: 2c8fbe4c513e - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 2c8fbe4c513e25e18f6d50d0f8b46536c04ec6ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641865159; 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=k8tyRDjaJ/9YTiP3OWMMpQXWz1RsJcDq8ud8ley9nMI=; b=tCvYTiD19rfwmHdqa1TGmiQUHjuUJN0PZXT//vyH/A/UZqKQpjwY2kNUsFBBB/mqWlHc3e x2g8LjKI9CJW10ZeT7iqRRmZ+50XpJr6XEM0v1uGw+/69FQCOq0bQCiXmUlP9zbxpiZV2Q dmcsdIQ08fqMs6Qw1ekDIKIA/5hInAyw/VwjZ/6brz4uPmlpQGW93guI6HetvNTsocWpZF Hz6fHhc6YcI45zrNUy4AQqvPy1XVUxr/JNhjWaoicFpZRbSwegSg+ISc2GFQ8T72LWA/JO 0VAT4AAXEAZL49FTvDci7J3JOj7qlrY53HQXACjzb/FlqYQeV3H154lvMAxvkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641865159; a=rsa-sha256; cv=none; b=aoH/RABT0a1DhCjkJVQe/NeRndtLNbQA9fd8JOYR2tTqoFJo86erBwcT2vJaoj11C9I/9r GNplWE3J6Hr7N8SoCdz0EDCvm2ac4E94HLwHbWHjiv8z3/KQPCfSzgF0kUlhe9md2YJq25 U2f6ESfOtIuiSrgP1dgE/tJUWM4UBy+hAoj92VOBrBdKVV71d69dEzRxnQWYP94OQA5A16 BjFCkr634OXF1AcA+k4QmIHoxVtKEAT3SFkKIgXGoJNYGOKRQwX4F6wJ2kRZYpwAlO+FQd 2ZaymqoXJ59yVu56EQeIv6sobh8Is9ix1iT9g3YH7sZoSsGsUb1SOJ+i8xkp0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2c8fbe4c513e25e18f6d50d0f8b46536c04ec6ca commit 2c8fbe4c513e25e18f6d50d0f8b46536c04ec6ca Author: Cy Schubert AuthorDate: 2021-12-29 01:41:03 +0000 Commit: Cy Schubert CommitDate: 2022-01-10 15:08:29 +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 0475a4386079..4415ef60caa9 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;