git: 2c3f2c5ddcf4 - stable/12 - ipfilter: Unconditionally expose SDT probe frb_natv4in

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Tue, 11 Jan 2022 01:42:06 UTC
The branch stable/12 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=2c3f2c5ddcf4931e9aa4754b0967517c8426f8a7

commit 2c3f2c5ddcf4931e9aa4754b0967517c8426f8a7
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-12-29 01:41:03 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
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;