[src/trunk]: src/sys/external/bsd/ipf/netinet Fix lookup of original destinat...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f3b141dc4acf
branches:  trunk
changeset: 818236:f3b141dc4acf
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Tue Oct 04 14:36:46 2016 +0000

description:
Fix lookup of original destination address when using a redirect rule.
This is required for transparent proxying by squid, for example.

diffstat:

 sys/external/bsd/ipf/netinet/ip_nat.c  |  8 ++++----
 sys/external/bsd/ipf/netinet/ip_nat6.c |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r d099779ca800 -r f3b141dc4acf sys/external/bsd/ipf/netinet/ip_nat.c
--- a/sys/external/bsd/ipf/netinet/ip_nat.c     Tue Oct 04 14:36:11 2016 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_nat.c     Tue Oct 04 14:36:46 2016 +0000
@@ -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 @@
 #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 @@
                                }
                        }
 
-                       np->nl_realip = nat->nat_ndstip;
-                       np->nl_realport = nat->nat_ndport;
+                       np->nl_realip = nat->nat_odstip;
+                       np->nl_realport = nat->nat_odport;
                }
        }
 
diff -r d099779ca800 -r f3b141dc4acf sys/external/bsd/ipf/netinet/ip_nat6.c
--- a/sys/external/bsd/ipf/netinet/ip_nat6.c    Tue Oct 04 14:36:11 2016 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_nat6.c    Tue Oct 04 14:36:46 2016 +0000
@@ -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 @@
                                }
                        }
 
-                       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;
                }
        }