CVS commit: src/sys/external/bsd/ipf/netinet

[Pierre Pronchery]

Module Name:    src
Committed By:   khorben
Date:           Thu Mar 17 04:07:42 UTC 2016

Modified Files:
        src/sys/external/bsd/ipf/netinet: ip_nat.c

Log Message:
Fix matching of ICMP queries when NAT'd through IPF

This notably fixes MTU updates for hosts issueing ICMP queries through a
NAT performed by NetBSD with IPF.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/ipf/netinet/ip_nat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/ipf/netinet/ip_nat.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.c:1.15 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.16
--- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.15	Tue Oct  6 10:21:08 2015
+++ src/sys/external/bsd/ipf/netinet/ip_nat.c	Thu Mar 17 04:07:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_nat.c,v 1.15 2015/10/06 10:21:08 prlw1 Exp $	*/
+/*	$NetBSD: ip_nat.c,v 1.16 2016/03/17 04:07:41 khorben Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -113,7 +113,7 @@ extern struct ifnet vpnif;
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.15 2015/10/06 10:21:08 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.16 2016/03/17 04:07:41 khorben Exp $");
 #else
 static const char sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_nat.c,v 1.1.1.2 2012/07/22 13:45:27 darrenr Exp";
@@ -4032,13 +4032,8 @@ ipf_nat_inlookup(fr_info_t *fin, u_int f
 		dport = htons(fin->fin_data[1]);
 		break;
 	case IPPROTO_ICMP :
-		if (flags & IPN_ICMPERR) {
-			sport = fin->fin_data[1];
-			dport = 0;
-		} else {
-			dport = fin->fin_data[1];
-			sport = 0;
-		}
+		sport = 0;
+		dport = fin->fin_data[1];
 		break;
 	default :
 		sport = 0;
@@ -4353,8 +4348,6 @@ ipf_nat_outlookup(fr_info_t *fin, u_int 
 	u_int hv;
 
 	ifp = fin->fin_ifp;
-	sport = 0;
-	dport = 0;
 
 	switch (p)
 	{
@@ -4364,12 +4357,12 @@ ipf_nat_outlookup(fr_info_t *fin, u_int 
 		dport = htons(fin->fin_data[1]);
 		break;
 	case IPPROTO_ICMP :
-		if (flags & IPN_ICMPERR)
-			sport = fin->fin_data[1];
-		else
-			dport = fin->fin_data[1];
+		sport = 0;
+		dport = fin->fin_data[1];
 		break;
 	default :
+		sport = 0;
+		dport = 0;
 		break;
 	}