Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Mar 2019 15:41:32 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r345450 - in head: libexec/rc/rc.d share/man/man5
Message-ID:  <201903231541.x2NFfWWE052423@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Sat Mar 23 15:41:32 2019
New Revision: 345450
URL: https://svnweb.freebsd.org/changeset/base/345450

Log:
  Add ability to automatically load ipfw_nat64, ipfw_nptv6 and ipfw_pmod
  modules by declaring corresponding variables in rc.conf. Also document
  them in rc.conf(5).
  
  Submitted by:	Dries Michiels
  Differential Revision:	https://reviews.freebsd.org/D19673

Modified:
  head/libexec/rc/rc.d/ipfw
  head/share/man/man5/rc.conf.5

Modified: head/libexec/rc/rc.d/ipfw
==============================================================================
--- head/libexec/rc/rc.d/ipfw	Sat Mar 23 14:10:05 2019	(r345449)
+++ head/libexec/rc/rc.d/ipfw	Sat Mar 23 15:41:32 2019	(r345450)
@@ -34,6 +34,15 @@ ipfw_prestart()
 	if checkyesno firewall_nat_enable; then
 		required_modules="$required_modules ipfw_nat"
 	fi
+	if checkyesno firewall_nat64_enable; then
+		required_modules="$required_modules ipfw_nat64"
+	fi
+	if checkyesno firewall_nptv6_enable; then
+		required_modules="$required_modules ipfw_nptv6"
+	fi
+	if checkyesno firewall_pmod_enable; then
+		required_modules="$required_modules ipfw_pmod"
+	fi
 }
 
 ipfw_start()

Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5	Sat Mar 23 14:10:05 2019	(r345449)
+++ head/share/man/man5/rc.conf.5	Sat Mar 23 15:41:32 2019	(r345450)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 19, 2018
+.Dd March 21, 2019
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -573,9 +573,11 @@ equivalent of
 .Va natd_enable .
 Setting this to
 .Dq Li YES
-enables kernel NAT.
+will automatically load the
+.Xr ipfw 8
+NAT kernel module if
 .Va firewall_enable
-must also be set to
+is also set to
 .Dq Li YES .
 .It Va firewall_nat_interface
 .Pq Vt str
@@ -588,6 +590,36 @@ kernel NAT should run.
 .It Va firewall_nat_flags
 .Pq Vt str
 Additional configuration parameters for kernel NAT should be placed here.
+.It Va firewall_nat64_enable
+.Pq Vt bool
+Setting this to
+.Dq Li YES
+will automatically load the
+.Xr ipfw 8
+NAT64 kernel module if
+.Va firewall_enable
+is also set to
+.Dq Li YES .
+.It Va firewall_nptv6_enable
+.Pq Vt bool
+Setting this to
+.Dq Li YES
+will automatically load the
+.Xr ipfw 8
+NPTv6 kernel module if
+.Va firewall_enable
+is also set to
+.Dq Li YES .
+.It Va firewall_pmod_enable
+.Pq Vt bool
+Setting this to
+.Dq Li YES
+will automatically load the
+.Xr ipfw 8
+pmod kernel module if
+.Va firewall_enable
+is also set to
+.Dq Li YES .
 .It Va dummynet_enable
 .Pq Vt bool
 Setting this to



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903231541.x2NFfWWE052423>