summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2017-03-11 17:46:59 +0000
committercy <cy@FreeBSD.org>2017-03-11 17:46:59 +0000
commitafcebfe9d0189768b2898274dd244763bdc5bf03 (patch)
tree0d5c56fbdf94a92c82a208a5475c8435b22d3e69 /sys/contrib
parent4ed787767bebc7313f30f6798b266f42d03cdb7e (diff)
downloadFreeBSD-src-afcebfe9d0189768b2898274dd244763bdc5bf03.zip
FreeBSD-src-afcebfe9d0189768b2898274dd244763bdc5bf03.tar.gz
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
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_nat.c4
-rw-r--r--sys/contrib/ipfilter/netinet/ip_nat6.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c
index ec06b0f..6c2b12c 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat.c
@@ -4704,8 +4704,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;
}
}
diff --git a/sys/contrib/ipfilter/netinet/ip_nat6.c b/sys/contrib/ipfilter/netinet/ip_nat6.c
index 72931c9..5985d6f 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat6.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat6.c
@@ -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;
}
}
OpenPOWER on IntegriCloud