Attachment 195977 Details for Bug 208566 – Provide additional dtrace output

[patch] Provide additional dtrace output

ip_nat-add_dtrace.diff (text/plain), 2.09 KB, created by Cy Schubert on 2018-08-07 14:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2018-08-07 14:50:02 UTC

Size: 2.09 KB

patch

obsolete

>Index: sys/contrib/ipfilter/netinet/ip_nat.c
>===================================================================
>--- sys/contrib/ipfilter/netinet/ip_nat.c	(revision 337417)
>+++ sys/contrib/ipfilter/netinet/ip_nat.c	(working copy)
>@@ -4951,7 +4951,7 @@
> 				case 0 :
> 					continue;
> 				case -1 :
>-					rval = -1;
>+					rval = -3;
> 					goto outmatchfail;
> 				case 1 :
> 				default :
>@@ -4996,7 +4996,7 @@
> 				natfailed = 0;
> 				break;
> 			}
>-			natfailed = -1;
>+			natfailed = -2;
> 		}
> 		if ((np == NULL) && (nmsk < softn->ipf_nat_map_max)) {
> 			nmsk++;
>@@ -5021,9 +5021,16 @@
> 
> 	switch (rval)
> 	{
>+	case -3 :
>+		/* ipf_nat_match() failure */
>+		/* FALLTHROUGH */
>+	case -2 :
>+		/* retry_roundrobin loop failure */
>+		/* FALLTHROUGH */
> 	case -1 :
>+		/* proxy failure detected by ipf_nat_out() */
> 		if (passp != NULL) {
>-			DT1(frb_natv4out, fr_info_t *, fin);
>+			DT2(frb_natv4out, fr_info_t *, fin, int, rval);
> 			NBUMPSIDED(1, ns_drop);
> 			*passp = FR_BLOCK;
> 			fin->fin_reason = FRB_NATV4;
>@@ -5030,6 +5037,7 @@
> 		}
> 		fin->fin_flx |= FI_BADNAT;
> 		NBUMPSIDED(1, ns_badnat);
>+		rval = -1;	/* We only return -1 on error. */
> 		break;
> 	case 0 :
> 		NBUMPSIDE(1, ns_ignored);
>@@ -5437,7 +5445,7 @@
> 				case 0 :
> 					continue;
> 				case -1 :
>-					rval = -1;
>+					rval = -3;
> 					goto inmatchfail;
> 				case 1 :
> 				default :
>@@ -5484,7 +5492,7 @@
> 				natfailed = 0;
> 				break;
> 			}
>-			natfailed = -1;
>+			natfailed = -2;
> 		}
> 		if ((np == NULL) && (rmsk < softn->ipf_nat_rdr_max)) {
> 			rmsk++;
>@@ -5509,9 +5517,16 @@
> 
> 	switch (rval)
> 	{
>+	case -3 :
>+		/* ipf_nat_match() failure */
>+		/* FALLTHROUGH */
>+	case -2 :
>+		/* retry_roundrobin loop failure */
>+		/* FALLTHROUGH */
> 	case -1 :
>+		/* proxy failure detected by ipf_nat_out() */
> 		if (passp != NULL) {
>-			DT1(frb_natv4in, fr_info_t *, fin);
>+			DT2(frb_natv4in, fr_info_t *, fin, int, rval);
> 			NBUMPSIDED(0, ns_drop);
> 			*passp = FR_BLOCK;
> 			fin->fin_reason = FRB_NATV4;
>@@ -5518,6 +5533,7 @@
> 		}
> 		fin->fin_flx |= FI_BADNAT;
> 		NBUMPSIDED(0, ns_badnat);
>+		rval = -1;	/* We only return -1 on error. */
> 		break;
> 	case 0 :
> 		NBUMPSIDE(0, ns_ignored);

Actions: View | Diff

Attachments on bug 208566: 195977 | 196269 | 196320 | 196324