svn commit: r315079 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Sat Mar 11 17:46:59 2017
New Revision: 315079
URL: https://svnweb.freebsd.org/changeset/base/315079

Log:
  MFC r312886:
  
  Fix lookup of original destination address when using a redirect rule.
  Transparent proxying, e.g. to squid, is an example of this.
  
  Obtained from:	NetBSD ip_nat.c r1.17, ip_nat6.c r1.10

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_nat.c
  stable/10/sys/contrib/ipfilter/netinet/ip_nat6.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
  stable/11/sys/contrib/ipfilter/netinet/ip_nat6.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_nat.c	Sat Mar 11 16:43:38 2017	(r315078)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_nat.c	Sat Mar 11 17:46:59 2017	(r315079)
@@ -4709,8 +4709,8 @@ ipf_nat_lookupredir(np)
 				}
 			}
 
-			np->nl_realip = nat->nat_ndstip;
-			np->nl_realport = nat->nat_ndport;
+			np->nl_realip = nat->nat_odstip;
+			np->nl_realport = nat->nat_odport;
 		}
  	}
 

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_nat6.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_nat6.c	Sat Mar 11 16:43:38 2017	(r315078)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_nat6.c	Sat Mar 11 17:46:59 2017	(r315079)
@@ -2521,8 +2521,8 @@ ipf_nat6_lookupredir(np)
 				}
 			}
 
-			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;
 		}
  	}