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

[Stephen Borrill]

Module Name:    src
Committed By:   sborrill
Date:           Tue Oct  4 14:36:46 UTC 2016

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

Log Message:
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.16 -r1.17 src/sys/external/bsd/ipf/netinet/ip_nat.c
cvs rdiff -u -r1.9 -r1.10 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.16 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.17
--- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.16	Thu Mar 17 04:07:41 2016
+++ src/sys/external/bsd/ipf/netinet/ip_nat.c	Tue Oct  4 14:36:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_nat.c,v 1.16 2016/03/17 04:07:41 khorben Exp $	*/
+/*	$NetBSD: ip_nat.c,v 1.17 2016/10/04 14:36:46 sborrill 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.16 2016/03/17 04:07:41 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.17 2016/10/04 14:36:46 sborrill 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";
@@ -4621,8 +4621,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.9 src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.10
--- src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.9	Tue Oct  6 10:21:08 2015
+++ src/sys/external/bsd/ipf/netinet/ip_nat6.c	Tue Oct  4 14:36:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_nat6.c,v 1.9 2015/10/06 10:21:08 prlw1 Exp $	*/
+/*	$NetBSD: ip_nat6.c,v 1.10 2016/10/04 14:36:46 sborrill Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -2471,8 +2471,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;
 		}
  	}