git: b6f072f767c5 - main - ipfilter: Unconditionally expose SDT probe frb_natv4in

[Cy Schubert]

The branch main has been updated by cy:

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

commit b6f072f767c58aca8d9440f9c1785731f58e815c
Author:     Cy Schubert <c...@freebsd.org>
AuthorDate: 2021-12-29 01:41:03 +0000
Commit:     Cy Schubert <c...@freebsd.org>
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;