[src/netbsd-7]: src/sys/external/bsd/ipf/netinet Pull up following revision(s...

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

details:   https://anonhg.NetBSD.org/src/rev/61105f063019
branches:  netbsd-7
changeset: 800096:61105f063019
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Dec 24 04:30:08 2016 +0000

description:
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.

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 88f4ae4e9303 -r 61105f063019 sys/external/bsd/ipf/netinet/ip_nat.c
--- a/sys/external/bsd/ipf/netinet/ip_nat.c     Sat Dec 24 04:07:25 2016 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_nat.c     Sat Dec 24 04:30:08 2016 +0000
@@ -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 @@
 #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 @@
                                }
                        }
 
-                       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 88f4ae4e9303 -r 61105f063019 sys/external/bsd/ipf/netinet/ip_nat6.c
--- a/sys/external/bsd/ipf/netinet/ip_nat6.c    Sat Dec 24 04:07:25 2016 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_nat6.c    Sat Dec 24 04:30:08 2016 +0000
@@ -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 @@
                                }
                        }
 
-                       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;
                }
        }