Module Name: src
Committed By: martin
Date: Sun Nov 5 17:39:38 UTC 2023
Modified Files:
src/share/examples/npf [netbsd-9]: host-npf.conf soho_gw-npf.conf
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1762):
share/examples/npf/host-npf.conf: revision 1.12
share/examples/npf/soho_gw-npf.conf: revision 1.21
Use proper variables for interface names in examples.
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/share/examples/npf/host-npf.conf
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/share/examples/npf/soho_gw-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.10.2.1 src/share/examples/npf/host-npf.conf:1.10.2.2
--- src/share/examples/npf/host-npf.conf:1.10.2.1 Tue Nov 19 10:58:30 2019
+++ src/share/examples/npf/host-npf.conf Sun Nov 5 17:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: host-npf.conf,v 1.10.2.1 2019/11/19 10:58:30 martin Exp $
+# $NetBSD: host-npf.conf,v 1.10.2.2 2023/11/05 17:39:38 martin Exp $
#
# Simple ruleset for a host with (i.e., not routing) two interfaces,
# ethernet and wifi.
@@ -16,8 +16,8 @@
$wired_if = "wm0"
$wifi_if = "iwn0"
-$wired_addrs= ifaddrs(wm0)
-$wifi_addrs = ifaddrs(iwn0)
+$wired_addrs= ifaddrs($wired_if)
+$wifi_addrs = ifaddrs($wifi_if)
alg "icmp"
Index: src/share/examples/npf/soho_gw-npf.conf
diff -u src/share/examples/npf/soho_gw-npf.conf:1.12.2.1 src/share/examples/npf/soho_gw-npf.conf:1.12.2.2
--- src/share/examples/npf/soho_gw-npf.conf:1.12.2.1 Tue Nov 19 10:56:35 2019
+++ src/share/examples/npf/soho_gw-npf.conf Sun Nov 5 17:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: soho_gw-npf.conf,v 1.12.2.1 2019/11/19 10:56:35 martin Exp $
+# $NetBSD: soho_gw-npf.conf,v 1.12.2.2 2023/11/05 17:39:38 martin Exp $
#
# SOHO border
#
@@ -7,8 +7,8 @@
#
$ext_if = "wm0"
-$ext_v4 = inet4(wm0)
-$ext_addrs = ifaddrs(wm0)
+$ext_v4 = inet4($ext_if)
+$ext_addrs = ifaddrs($ext_if)
$int_if = "wm1"
