Do an ipf -y after bringing up ppp to ensure rules which mention ppp get

matched. Moification on PR to handle ipnat not being dependant on ipfilter_enable PR: 22859
2001-10-20 04:46:32 +00:00 · 2001-10-20 04:46:32 +00:00 · f645349388
commit f645349388
parent 9645656d2c
7 changed files with 98 additions and 0 deletions
--- a/etc/network.subr
+++ b/etc/network.subr
@ -275,6 +275,20 @@ network_pass1() {
 		;;
 	esac

+	# Re-Sync ipfilter
+	#
+	case ${ipfilter_enable} in
+	[Yy][Ee][Ss])
+		${ipfilter_program:-/sbin/ipf -y}
+		;;
+	*)
+		case ${ipnat_enable} in
+		[Yy][Ee][Ss])
+			${ipfilter_program:-/sbin/ipf -y}
+			;;
+		esac
+	esac
+
 	# Initialize IP filtering using ipfw
 	#
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@ -275,6 +275,20 @@ network_pass1() {
 		;;
 	esac

+	# Re-Sync ipfilter
+	#
+	case ${ipfilter_enable} in
+	[Yy][Ee][Ss])
+		${ipfilter_program:-/sbin/ipf -y}
+		;;
+	*)
+		case ${ipnat_enable} in
+		[Yy][Ee][Ss])
+			${ipfilter_program:-/sbin/ipf -y}
+			;;
+		esac
+	esac
+
 	# Initialize IP filtering using ipfw
 	#
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@ -275,6 +275,20 @@ network_pass1() {
 		;;
 	esac

+	# Re-Sync ipfilter
+	#
+	case ${ipfilter_enable} in
+	[Yy][Ee][Ss])
+		${ipfilter_program:-/sbin/ipf -y}
+		;;
+	*)
+		case ${ipnat_enable} in
+		[Yy][Ee][Ss])
+			${ipfilter_program:-/sbin/ipf -y}
+			;;
+		esac
+	esac
+
 	# Initialize IP filtering using ipfw
 	#
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@ -275,6 +275,20 @@ network_pass1() {
 		;;
 	esac

+	# Re-Sync ipfilter
+	#
+	case ${ipfilter_enable} in
+	[Yy][Ee][Ss])
+		${ipfilter_program:-/sbin/ipf -y}
+		;;
+	*)
+		case ${ipnat_enable} in
+		[Yy][Ee][Ss])
+			${ipfilter_program:-/sbin/ipf -y}
+			;;
+		esac
+	esac
+
 	# Initialize IP filtering using ipfw
 	#
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@ -275,6 +275,20 @@ network_pass1() {
 		;;
 	esac

+	# Re-Sync ipfilter
+	#
+	case ${ipfilter_enable} in
+	[Yy][Ee][Ss])
+		${ipfilter_program:-/sbin/ipf -y}
+		;;
+	*)
+		case ${ipnat_enable} in
+		[Yy][Ee][Ss])
+			${ipfilter_program:-/sbin/ipf -y}
+			;;
+		esac
+	esac
+
 	# Initialize IP filtering using ipfw
 	#
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@ -275,6 +275,20 @@ network_pass1() {
 		;;
 	esac

+	# Re-Sync ipfilter
+	#
+	case ${ipfilter_enable} in
+	[Yy][Ee][Ss])
+		${ipfilter_program:-/sbin/ipf -y}
+		;;
+	*)
+		case ${ipnat_enable} in
+		[Yy][Ee][Ss])
+			${ipfilter_program:-/sbin/ipf -y}
+			;;
+		esac
+	esac
+
 	# Initialize IP filtering using ipfw
 	#
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then
--- a/etc/rc.network
+++ b/etc/rc.network
@ -275,6 +275,20 @@ network_pass1() {
 		;;
 	esac

+	# Re-Sync ipfilter
+	#
+	case ${ipfilter_enable} in
+	[Yy][Ee][Ss])
+		${ipfilter_program:-/sbin/ipf -y}
+		;;
+	*)
+		case ${ipnat_enable} in
+		[Yy][Ee][Ss])
+			${ipfilter_program:-/sbin/ipf -y}
+			;;
+		esac
+	esac
+
 	# Initialize IP filtering using ipfw
 	#
 	if /sbin/ipfw -q flush > /dev/null 2>&1; then