CVS commit: [netbsd-7] src/sys/external/bsd/ipf/netinet

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Sat Dec 24 04:30:08 UTC 2016

Modified Files:
        src/sys/external/bsd/ipf/netinet [netbsd-7]: ip_nat.c ip_nat6.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1261):
        sys/external/bsd/ipf/netinet/ip_nat.c: revision 1.17
        sys/external/bsd/ipf/netinet/ip_nat6.c: revision 1.10
Fix lookup of original destination address when using a redirect rule.
This is required for transparent proxying by squid, for example.


To generate a diff of this commit:
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/external/bsd/ipf/netinet/ip_nat.c
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/sys/external/bsd/ipf/netinet/ip_nat6.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.13.2.2 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.13.2.3
--- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.13.2.2	Fri Apr 29 18:58:17 2016
+++ src/sys/external/bsd/ipf/netinet/ip_nat.c	Sat Dec 24 04:30:08 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_nat.c,v 1.13.2.2 2016/04/29 18:58:17 snj Exp $	*/
+/*	$NetBSD: ip_nat.c,v 1.13.2.3 2016/12/24 04:30:08 snj 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.13.2.2 2016/04/29 18:58:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.13.2.3 2016/12/24 04:30:08 snj 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";
@@ -4620,8 +4620,8 @@ ipf_nat_lookupredir(ipf_main_softc_t *so
 				}
 			}
 
-			np->nl_realip = nat->nat_ndstip;
-			np->nl_realport = nat->nat_ndport;
+			np->nl_realip = nat->nat_odstip;
+			np->nl_realport = nat->nat_odport;
 		}
  	}
 

Index: src/sys/external/bsd/ipf/netinet/ip_nat6.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.7.4.1 src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.7.4.2
--- src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.7.4.1	Sat Aug  8 10:09:57 2015
+++ src/sys/external/bsd/ipf/netinet/ip_nat6.c	Sat Dec 24 04:30:08 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_nat6.c,v 1.7.4.1 2015/08/08 10:09:57 martin Exp $	*/
+/*	$NetBSD: ip_nat6.c,v 1.7.4.2 2016/12/24 04:30:08 snj Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -2470,8 +2470,8 @@ ipf_nat6_lookupredir(ipf_main_softc_t *s
 				}
 			}
 
-			np->nl_realip6 = nat->nat_ndst6.in6;
-			np->nl_realport = nat->nat_ndport;
+			np->nl_realip6 = nat->nat_odst6.in6;
+			np->nl_realport = nat->nat_odport;
 		}
  	}