svn commit: r338169 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Wed Aug 22 01:04:52 2018
New Revision: 338169
URL: https://svnweb.freebsd.org/changeset/base/338169

Log:
  MFC r338045:
  
  Expose np (nat_t - an entry in the nat table structure) in the DTrace
  probe when nat fails (label badnat). This is useful in diagnosing
  failed NAT issues and was used in PR/208566.
  
  PR:		208566

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_nat.c	Tue Aug 21 23:42:20 2018	(r338168)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_nat.c	Wed Aug 22 01:04:52 2018	(r338169)
@@ -3264,7 +3264,7 @@ ipf_nat_add(fin, np, natsave, flags, direction)
 
 	goto done;
 badnat:
-	DT2(ns_badnatnew, fr_info_t *, fin, nat_t *, nat);
+	DT3(ns_badnatnew, fr_info_t *, fin, nat_t *, nat, ipnat_t *, np);
 	NBUMPSIDE(fin->fin_out, ns_badnatnew);
 	if ((hm = nat->nat_hm) != NULL)
 		ipf_nat_hostmapdel(softc, &hm);