svn commit: r216348 - stable/8/sys/netinet/ipfw
Andrey V. Elsukov
ae at FreeBSD.org
Fri Dec 10 05:18:38 UTC 2010
Author: ae
Date: Fri Dec 10 05:18:37 2010
New Revision: 216348
URL: http://svn.freebsd.org/changeset/base/216348
Log:
MFC r213254 by luigi:
fix breakage in in-kernel NAT: the code did not honor
net.inet.ip.fw.one_pass and always moved to the next rule
in case of a successful nat.
This should fix several related PR (waiting for feedback
before closing them)
PR: 145167 149572 150141
Approved by: re (bz)
Modified:
stable/8/sys/netinet/ipfw/ip_fw_pfil.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/netinet/ipfw/ip_fw_pfil.c
==============================================================================
--- stable/8/sys/netinet/ipfw/ip_fw_pfil.c Fri Dec 10 05:16:25 2010 (r216347)
+++ stable/8/sys/netinet/ipfw/ip_fw_pfil.c Fri Dec 10 05:18:37 2010 (r216348)
@@ -231,6 +231,11 @@ again:
break;
case IP_FW_NAT:
+ /* honor one-pass in case of successful nat */
+ if (V_fw_one_pass)
+ break; /* ret is already 0 */
+ goto again;
+
case IP_FW_REASS:
goto again; /* continue with packet */
More information about the svn-src-stable
mailing list